Improving locations selector and location REST updates