Searching now works properly