Make search work, add 3 commands in main