Minor edits to search