Fixing bug where spaces in unqualified fields were dumped