diff --git a/TeroSubtitler/subtitleapi/UWSubtitleAPI.Utils.pas b/TeroSubtitler/subtitleapi/UWSubtitleAPI.Utils.pas
index 641b47d8..7a883153 100644
--- a/TeroSubtitler/subtitleapi/UWSubtitleAPI.Utils.pas
+++ b/TeroSubtitler/subtitleapi/UWSubtitleAPI.Utils.pas
@@ -84,7 +84,7 @@ procedure XMLToStrings(const XmlDoc: TXMLDocument; const StringList: TUWStringLi
     Stream.Position := 0;
 
     if ReplaceEntities then
-      StringList.Text := HTMLDecode(Stream.DataString) //HTMLReplaceEntities(Stream.DataString)
+      StringList.Text := StrToXMLValue(Stream.DataString) //HTMLDecode(Stream.DataString) //HTMLReplaceEntities(Stream.DataString)
     else
       StringList.Text := Stream.DataString;
   finally
@@ -183,7 +183,7 @@ function XMLExtractTextContent(const A: TDOMNodeList): String;
   for I := 0 to A.Count-1 do
     Result := Result + DOMNodeToString(A[I]);
 
-  Result := XMLTagsToTS(Result);
+  Result := XMLTagsToTS(XMLValueToStr(Result));
 end;
 
 // -----------------------------------------------------------------------------
diff --git a/TeroSubtitler/subtitleapi/UWSubtitleAPI.pas b/TeroSubtitler/subtitleapi/UWSubtitleAPI.pas
index 2d11aac2..ec502924 100644
--- a/TeroSubtitler/subtitleapi/UWSubtitleAPI.pas
+++ b/TeroSubtitler/subtitleapi/UWSubtitleAPI.pas
@@ -766,7 +766,7 @@ constructor TUWSubtitles.Create;
   FSearchSkip    := 0;
   FHeader        := NIL;
   FAutoSort      := True;
-  FReplaceEntity := True;
+  FReplaceEntity := False;
   FTag           := 0;
   FTimeBase      := stbMedia;
   New(FFormatProperties);