Fix content_type_id = 35 should be flexible