Modify search command to search more accurately