diff --git a/src/Config/Config.cpp b/src/Config/Config.cpp
index 6c4a5d6ea..1a3f7cdc3 100644
--- a/src/Config/Config.cpp
+++ b/src/Config/Config.cpp
@@ -1422,7 +1422,7 @@ void LoadSettings()
     GET_BOOL_VALUE_FROM_INISECTION(LoadASCIIasUTF8, true);
     GET_BOOL_VALUE_FROM_INISECTION(UseReliableCEDonly, true);
     GET_BOOL_VALUE_FROM_INISECTION(LoadNFOasOEM, true);
-    GET_BOOL_VALUE_FROM_INISECTION(NoEncodingTags, false);
+    GET_BOOL_VALUE_FROM_INISECTION(NoEncodingTags, true);
     GET_BOOL_VALUE_FROM_INISECTION(SkipUnicodeDetection, false);
     GET_BOOL_VALUE_FROM_INISECTION(SkipANSICodePageDetection, false);
     GET_INT_VALUE_FROM_INISECTION(DefaultEOLMode, SC_EOL_CRLF, SC_EOL_CRLF, SC_EOL_LF);
diff --git a/src/EncodingDetection.cpp b/src/EncodingDetection.cpp
index a72f2502d..583f04ce2 100644
--- a/src/EncodingDetection.cpp
+++ b/src/EncodingDetection.cpp
@@ -991,13 +991,11 @@ static void _SetFileVars(char* buffer, size_t cch, LPFILEVARS lpfv)
 
   if (!bHasSignature && !Settings.NoEncodingTags && !bDisableFileVar) {
 
-    if (FileVars_ParseStr(buffer, "encoding", lpfv->chEncoding, COUNTOF(lpfv->chEncoding))) {
+    if (FileVars_ParseStr(buffer, "coding", lpfv->chEncoding, COUNTOF(lpfv->chEncoding))) {
       lpfv->mask |= FV_ENCODING;
-    }
-    else if (FileVars_ParseStr(buffer, "charset", lpfv->chEncoding, COUNTOF(lpfv->chEncoding))) {
+    } else if (FileVars_ParseStr(buffer, "encoding", lpfv->chEncoding, COUNTOF(lpfv->chEncoding))) {
       lpfv->mask |= FV_ENCODING;
-    }
-    else if (FileVars_ParseStr(buffer, "coding", lpfv->chEncoding, COUNTOF(lpfv->chEncoding))) {
+    } else if (FileVars_ParseStr(buffer, "charset", lpfv->chEncoding, COUNTOF(lpfv->chEncoding))) {
       lpfv->mask |= FV_ENCODING;
     }
   }
@@ -1136,7 +1134,7 @@ extern "C" bool FileVars_ParseInt(char* pszData, char* pszName, int* piValue) {
 //
 extern "C" bool FileVars_ParseStr(char* pszData, char* pszName, char* pszValue, int cchValue) {
 
-  char* pvStart = StrStrIA(pszData, pszName);
+  const char* pvStart = StrStrIA(pszData, pszName);
   while (pvStart) {
     char chPrev = (pvStart > pszData) ? *(pvStart - 1) : 0;
     if (!IsCharAlphaNumericA(chPrev) && chPrev != '-' && chPrev != '_') {