Forgot underline
Fixed problem with registration of search citeria in collections, the previous registration broke export feature of plone.app.registry
Updated changes
Merge branch 'master' into sm.template