Fixed issue with hypen and apostrophe