Small cleanup
Now POIs with shapes can be returned as marker catch this case

This is because getMapFeature for a NumberedPOI will return a marker
regardless of the "shape" being there.
Sort the markers we listed as children correctly