Fix some regular expressions in the router