BUG Fixed: form content with single quote