Fix batching issues when not using plone.batching