Updated the URL helper so it can use URL params from the current route
Fixed bug with route matching