Use content-core macro instead of body field