added clustering and tooltip