Fix/657/refactor geocoder a bit