Now search works correctly