#1293 added updates to resolve conflict on megamenu