Added escaping for apostrophe