Fix for the grouping problem in topology map
Fix for the grouping problem in topology map