improved handling of multivalue fields in the QueryCommand