Fix: Don't include current query parameters for named routes
Fix: Don't include current query parameters for named routes
Fix: merge query and route parameters