MIL-488 query fixes