Work on/improve CLI route matching