This works on Plone 4.1 site now

These changes help