Correction for field names

Followed Matt Lloyd's corrections (marked MDL) to solve the case when
the fields are not named the same as in the demo. Also updated sample
data and sample result.