couple of nh query bugs