more enhancements to FW querying