Added a fix for the new layout, which addresses the issue of having the same name in the same channel.