merge from working geocoder to avoid ServletContainer ClassNotFoundException