Adjust changing behavior for escaping single quote