[master] Rework the placement of items on hubs.