Change Search, only one string is searched
cosmetic changes