[hcat] Adding queries