Remove route duplication

I have removed the route duplication by using optional route parameters.