fix primary/composite mistake with area
a better validator - find also expected but missing