merge change from repo.
Refactor taxo filter views.
Refactor clustering on map move/zoom event.