small changes cleanup to querier