refactored sql code that adds city, zip to address points to account for new structure of jursidictional data and to improve performance