Fix plone keywords not displaying and cleanup