Fix listener recover attributes
Fix listener merge