Updated search for new query implementation