[BZ87][BZ207] Fix Geocoder and Geofencer for 4.1.1 version.