Formulated URL service to use current matched route parameters
Fixed typos
Code cleaning up