Fix subfield handling and default contenttype