Actually stop monitoring for all locations when turned off to get rid of the location services indicator in the status bar.
Reorganised geofence monitoring code.