Do a better event re-injection and fix quotes in CKAN attrValues