Improved behavior of current location tracking