missing an addition to the context stack
adjustments to account for the notion of field value ids