Map filter
Marker clusterer and some other fixes