Small improvements to Querier and Var