Added content_primary handeling