Fixed some escape issues related to single quote