Add fixes for content type restriction problems