simplify filter + refresh gazetteer on map refresh
fix conflicts, cleanup code