Refactored geocoder to use data joins