More refinements for geofencing