Improve saving and editor display of internal quotes