Fixes for manual/auto listing blocks

Kevin Paxmanrequested to merge
kpaxman/release-fixes-2 into 1.1.x

MAke manual list show proper names for content types rather than guess from array keys. Maybe a bit brute force.

Merge request reports