Feature geocoder filtering and refactoring