CF-177: fix issues with content type printed twice