update location handling
update server-side handling of locations
update location handling