updates for data integrity.  Attributes must have empty string for
entity type qualifier fields