Columns, rather than fields, may be missing.
Avoid building field names twice plus some more stylistic improvements.