Used route-resolving to get rid of location parsing.