Improve commands for search