Fixed to work with all standard types from plone.app.contenttypes