#6517: Reexport and revert content view.
Merge pull request #6600 from openscholar/6517-filter_content_types

Reexport and revert content view.