Add additional logic to contrain return values form geocoder to ease query issue