update server-side handling of locations