Fix for not encoding quote and apostrophe signs