[OE-2663] fixed apostrophe bugs