Highlighted "Item / Unit" on Minimap does not go to top layer

When I am cycling through units or buildings to find something I cannot find it half the time because the Highlighted item is underneath other items.

Fix: The highlighted item should always come to the top layer on the minimap.

This is presenting a large barrier for newer players.