* Make command search a bit more robust
* Remove command validation