Improving apostrophe escaping