Improve search with "basics results"
Add new commands