BugFix: Update routechange to location change