Added checking of search string