Search logic was slightly changed
Searching was fixed