Misc changes related to db integration and geocoding