Fix incorrect column mapping on CSV upload.

Handle formatted value column (which had been missing for some time).
Fixes #525.