adding clustering and map search