diff --git a/DigitalData.Core.Client/BaseHttpClientService.cs b/DigitalData.Core.Client/BaseHttpClientService.cs
index 843ef2d..f6a541a 100644
--- a/DigitalData.Core.Client/BaseHttpClientService.cs
+++ b/DigitalData.Core.Client/BaseHttpClientService.cs
@@ -86,7 +86,7 @@ namespace DigitalData.Core.Client
             {
                 var query = HttpUtility.ParseQueryString(uriBuilder.Query);
 
-                var flagParams = queryParams.Where(param => param.Value is null).Select(param => HttpUtility.UrlEncode(param.Key));
+                var flagParams = queryParams.Where(param => param.Value is null).Select(param => param.Key);
 
                 var valueParams = queryParams.Where(param => param.Value is not null);
 
@@ -94,12 +94,12 @@ namespace DigitalData.Core.Client
                     query[param.Key] = param.Value switch
                     {
                         bool b => b.ToString().ToLower(),
-                        _ => HttpUtility.UrlEncode(param.Value.ToString())
+                        _ => param.Value.ToString()
                     };
 
-                var flagQuery = string.Join(QUERY_SEPARATOR, flagParams);
-
-                uriBuilder.Query = string.Join(QUERY_SEPARATOR, query.ToString(), flagQuery);
+                if (flagParams.Any())
+                    uriBuilder.Query = string.Join(QUERY_SEPARATOR, query.ToString(), string.Join(QUERY_SEPARATOR, flagParams));
+                else uriBuilder.Query = query.ToString();
             }
 
             var requestUri = uriBuilder.Uri;
diff --git a/DigitalData.Core.Client/DigitalData.Core.Client.csproj b/DigitalData.Core.Client/DigitalData.Core.Client.csproj
index 2688cb4..f01d1e7 100644
--- a/DigitalData.Core.Client/DigitalData.Core.Client.csproj
+++ b/DigitalData.Core.Client/DigitalData.Core.Client.csproj
@@ -6,7 +6,7 @@
     <Nullable>enable</Nullable>
     <Description>This package provides HTTP client extension methods for the DigitalData.Core library, offering simplified and asynchronous methods for fetching and handling HTTP responses. It includes utility methods for sending GET requests, reading response content as text or JSON, and deserializing JSON into dynamic or strongly-typed objects using Newtonsoft.Json. These extensions facilitate efficient and easy-to-read HTTP interactions in client applications.</Description>
     <PackageId>DigitalData.Core.Client</PackageId>
-    <Version>2.0.1</Version>
+    <Version>2.0.3</Version>
     <Authors>Digital Data GmbH</Authors>
     <Company>Digital Data GmbH</Company>
     <Product>Digital Data GmbH</Product>
@@ -15,8 +15,8 @@
     <PackageIcon>core_icon.png</PackageIcon>
     <RepositoryUrl>http://git.dd:3000/AppStd/WebCoreModules.git</RepositoryUrl>
     <PackageTags>digital data core http client json serilization</PackageTags>
-    <AssemblyVersion>2.0.1</AssemblyVersion>
-    <FileVersion>2.0.1</FileVersion>
+    <AssemblyVersion>2.0.3</AssemblyVersion>
+    <FileVersion>2.0.3</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>