Maps/Clustering: add map_index