More fixes to route label collapsing