Add clustering and custommarker popup