Fix hqmf r2 fields