Fixed issue with subset in map data