Fixed bugs relating to unescaped single/double quotes