Set default for user radius
Fix merge conflict
Fix geolocation