fixes for context menu with quotes for issue #758