Separate geocoding update code from retrieval code