Fixed content types so they're not missing their first half.
Merge remote-tracking branch 'origin/hj/valid-content-types'