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