[dna-dev] Update on the query/search implementation