bug fix exept geocode