fixed up IDs in popup to facilitate CSEP groups
CSEP groups hide and show appropriately
Merge branch 'corresponding_map_markers'