Updated single quote handling