Add geo search & some bug fix