Fixed issues with field names in Query III