HOSTDEV-1933 some inquiry fixes