Fix issue where a single item in a location where a collection is possible (ordered edge) breaks mapping