Index: /TFP-WebServer/CommandExtensions/CommandExtensions.csproj
===================================================================
--- /TFP-WebServer/CommandExtensions/CommandExtensions.csproj	(revision 468)
+++ /TFP-WebServer/CommandExtensions/CommandExtensions.csproj	(revision 469)
@@ -30,5 +30,5 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>..\bin\Mods\TFP_CommandExtensions\</OutputPath>
-    <DebugType>full</DebugType>
+    <DebugType>portable</DebugType>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
@@ -37,5 +37,5 @@
     <DefineConstants>ENABLE_PROFILER</DefineConstants>
     <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
+    <DebugType>portable</DebugType>
   </PropertyGroup>
   <ItemGroup>
Index: /TFP-WebServer/CommandExtensions/ModInfo.xml
===================================================================
--- /TFP-WebServer/CommandExtensions/ModInfo.xml	(revision 468)
+++ /TFP-WebServer/CommandExtensions/ModInfo.xml	(revision 469)
@@ -5,5 +5,5 @@
 	<Description value="Additional commands for server operation" />
 	<Author value="The Fun Pimps LLC" />
-	<Version value="21.1.16.0" />
+	<Version value="21.1.16.4" />
 	<Website value="" />
 </xml>
Index: /TFP-WebServer/MapRendering/MapRendering.csproj
===================================================================
--- /TFP-WebServer/MapRendering/MapRendering.csproj	(revision 468)
+++ /TFP-WebServer/MapRendering/MapRendering.csproj	(revision 469)
@@ -33,5 +33,5 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>..\bin\Mods\TFP_MapRendering\</OutputPath>
-    <DebugType>full</DebugType>
+    <DebugType>portable</DebugType>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
@@ -40,5 +40,5 @@
     <DefineConstants>ENABLE_PROFILER</DefineConstants>
     <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
+    <DebugType>portable</DebugType>
   </PropertyGroup>
   <ItemGroup>
Index: /TFP-WebServer/MapRendering/ModInfo.xml
===================================================================
--- /TFP-WebServer/MapRendering/ModInfo.xml	(revision 468)
+++ /TFP-WebServer/MapRendering/ModInfo.xml	(revision 469)
@@ -5,5 +5,5 @@
 	<Description value="Render the game map to image map tiles as it is uncovered" />
 	<Author value="The Fun Pimps LLC" />
-	<Version value="21.1.16.0" />
+	<Version value="21.1.16.4" />
 	<Website value="" />
 </xml>
Index: /TFP-WebServer/MarkersMod/MarkersMod.csproj
===================================================================
--- /TFP-WebServer/MarkersMod/MarkersMod.csproj	(revision 468)
+++ /TFP-WebServer/MarkersMod/MarkersMod.csproj	(revision 469)
@@ -33,5 +33,5 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>..\bin\Mods\Xample_MarkersMod\</OutputPath>
-    <DebugType>full</DebugType>
+    <DebugType>portable</DebugType>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
@@ -40,5 +40,5 @@
     <DefineConstants>ENABLE_PROFILER</DefineConstants>
     <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
+    <DebugType>portable</DebugType>
   </PropertyGroup>
   <ItemGroup>
Index: /TFP-WebServer/MarkersMod/ModInfo.xml
===================================================================
--- /TFP-WebServer/MarkersMod/ModInfo.xml	(revision 468)
+++ /TFP-WebServer/MarkersMod/ModInfo.xml	(revision 469)
@@ -5,5 +5,5 @@
 	<Description value="Allows placing custom markers on the web map" />
 	<Author value="Catalysm and Alloc" />
-	<Version value="21.1.16.1" />
+	<Version value="21.1.16.4" />
 	<Website value="" />
 </xml>
Index: /TFP-WebServer/SpaceWizards.HttpListener/SpaceWizards.HttpListener.csproj
===================================================================
--- /TFP-WebServer/SpaceWizards.HttpListener/SpaceWizards.HttpListener.csproj	(revision 468)
+++ /TFP-WebServer/SpaceWizards.HttpListener/SpaceWizards.HttpListener.csproj	(revision 469)
@@ -35,5 +35,5 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>..\bin\Mods\TFP_WebServer\</OutputPath>
-    <DebugType>full</DebugType>
+    <DebugType>portable</DebugType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <DefineConstants>UNITY_NETFRAMEWORK</DefineConstants>
@@ -44,5 +44,5 @@
     <DefineConstants>UNITY_NETFRAMEWORK;ENABLE_PROFILER</DefineConstants>
     <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
+    <DebugType>portable</DebugType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
Index: /TFP-WebServer/SpaceWizards.HttpListener/src/System/Net/HttpListenerRequest.cs
===================================================================
--- /TFP-WebServer/SpaceWizards.HttpListener/src/System/Net/HttpListenerRequest.cs	(revision 468)
+++ /TFP-WebServer/SpaceWizards.HttpListener/src/System/Net/HttpListenerRequest.cs	(revision 469)
@@ -78,8 +78,14 @@
         }
 
+        // TFP: Added to manually set the encoding used for the query parameters
+        private Encoding contentEncoding;
         public Encoding ContentEncoding
         {
             get
             {
+                if (contentEncoding != null) {
+                    return contentEncoding;
+                }
+                
                 if (UserAgent != null && CultureInfo.InvariantCulture.CompareInfo.IsPrefix(UserAgent, "UP"))
                 {
@@ -89,5 +95,6 @@
                         try
                         {
-                            return Encoding.GetEncoding(postDataCharset);
+                            contentEncoding = Encoding.GetEncoding(postDataCharset);
+                            return contentEncoding;
                         }
                         catch (ArgumentException)
@@ -105,5 +112,6 @@
                             try
                             {
-                                return Encoding.GetEncoding(charSet);
+                                contentEncoding = Encoding.GetEncoding(charSet);
+                                return contentEncoding;
                             }
                             catch (ArgumentException)
@@ -113,5 +121,10 @@
                     }
                 }
-                return Encoding.Default;
+                contentEncoding = Encoding.Default;
+                return contentEncoding;
+            }
+            set
+            {
+                contentEncoding = value;
             }
         }
Index: /TFP-WebServer/WebServer/ModInfo.xml
===================================================================
--- /TFP-WebServer/WebServer/ModInfo.xml	(revision 468)
+++ /TFP-WebServer/WebServer/ModInfo.xml	(revision 469)
@@ -5,5 +5,5 @@
 	<Description value="Integrated Webserver for the Web Dashboard and server APIs" />
 	<Author value="The Fun Pimps LLC" />
-	<Version value="21.1.16.3" />
+	<Version value="21.1.16.4" />
 	<Website value="" />
 </xml>
Index: /TFP-WebServer/WebServer/WebServer.csproj
===================================================================
--- /TFP-WebServer/WebServer/WebServer.csproj	(revision 468)
+++ /TFP-WebServer/WebServer/WebServer.csproj	(revision 469)
@@ -33,5 +33,5 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>..\bin\Mods\TFP_WebServer\</OutputPath>
-    <DebugType>full</DebugType>
+    <DebugType>portable</DebugType>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
@@ -40,5 +40,5 @@
     <DefineConstants>ENABLE_PROFILER</DefineConstants>
     <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
+    <DebugType>portable</DebugType>
   </PropertyGroup>
   <ItemGroup>
Index: /TFP-WebServer/WebServer/src/Web.cs
===================================================================
--- /TFP-WebServer/WebServer/src/Web.cs	(revision 468)
+++ /TFP-WebServer/WebServer/src/Web.cs	(revision 469)
@@ -3,4 +3,5 @@
 using System.IO;
 using System.Net.Sockets;
+using System.Text;
 using SpaceWizards.HttpListener;
 using UnityEngine;
@@ -235,4 +236,5 @@
 				}
 
+				request.ContentEncoding = Encoding.UTF8;
 				RequestContext context = new RequestContext (requestPath, request, response, conn, permissionLevel);
 
Index: /TFP-WebServer/bin/Mods/TFP_CommandExtensions/ModInfo.xml
===================================================================
--- /TFP-WebServer/bin/Mods/TFP_CommandExtensions/ModInfo.xml	(revision 468)
+++ /TFP-WebServer/bin/Mods/TFP_CommandExtensions/ModInfo.xml	(revision 469)
@@ -5,5 +5,5 @@
 	<Description value="Additional commands for server operation" />
 	<Author value="The Fun Pimps LLC" />
-	<Version value="21.1.16.0" />
+	<Version value="21.1.16.4" />
 	<Website value="" />
 </xml>
Index: /TFP-WebServer/bin/Mods/TFP_MapRendering/ModInfo.xml
===================================================================
--- /TFP-WebServer/bin/Mods/TFP_MapRendering/ModInfo.xml	(revision 468)
+++ /TFP-WebServer/bin/Mods/TFP_MapRendering/ModInfo.xml	(revision 469)
@@ -5,5 +5,5 @@
 	<Description value="Render the game map to image map tiles as it is uncovered" />
 	<Author value="The Fun Pimps LLC" />
-	<Version value="21.1.16.0" />
+	<Version value="21.1.16.4" />
 	<Website value="" />
 </xml>
Index: /TFP-WebServer/bin/Mods/TFP_WebServer/ModInfo.xml
===================================================================
--- /TFP-WebServer/bin/Mods/TFP_WebServer/ModInfo.xml	(revision 468)
+++ /TFP-WebServer/bin/Mods/TFP_WebServer/ModInfo.xml	(revision 469)
@@ -5,5 +5,5 @@
 	<Description value="Integrated Webserver for the Web Dashboard and server APIs" />
 	<Author value="The Fun Pimps LLC" />
-	<Version value="21.1.16.3" />
+	<Version value="21.1.16.4" />
 	<Website value="" />
 </xml>
Index: /TFP-WebServer/bin/Mods/Xample_MarkersMod/ModInfo.xml
===================================================================
--- /TFP-WebServer/bin/Mods/Xample_MarkersMod/ModInfo.xml	(revision 468)
+++ /TFP-WebServer/bin/Mods/Xample_MarkersMod/ModInfo.xml	(revision 469)
@@ -5,5 +5,5 @@
 	<Description value="Allows placing custom markers on the web map" />
 	<Author value="Catalysm and Alloc" />
-	<Version value="21.1.16.1" />
+	<Version value="21.1.16.4" />
 	<Website value="" />
 </xml>