Fix extra field values not appearing when editing dataset