fixes to HWCfgDB queries