DIQ-18 added field reference to duplicate entity name error