Fix for field names with spaces

The code as is doesn't handle pivot fields with spaces.  This is only a
partial solution, in that it will still fail if a field name contains
the string " as ".
Minor grammar and punctuation