Fix refactoring of geolocatable modules