Workspace: Better matching on route parameters