SearchCommand revised