fix location service bugs