Fixed retrieval via map name