Fix for #151 - Error message field names should use label text, not raw field name