bugfix: more field escaping for items w/ single-quotes in them