Trying to fix a bug in the search command.