Fixed: receiver association
Fixed, removed unnecessary dependency to emptyId from qualified field