Searching works properly again