Properly handle content_type_id and content_id.