Changes on JS and collrctor

1. Enable clustering on map
2. Fix on collector infinit cicle