Finish work on improving the CLI route match