fix  apostrophe and upload issue