Fix router regex matches