[#107746] Changes to update the geocoding service to adapt to viewer