Fixes the route name alignment and geolocation hanging regression