Escape quote fix - handle the IM fields properly.