diff --git a/SharedKernel.Demo/Program.cs b/SharedKernel.Demo/Program.cs
index 83e0f10..b3e08ad 100644
--- a/SharedKernel.Demo/Program.cs
+++ b/SharedKernel.Demo/Program.cs
@@ -1,6 +1,8 @@
+using System.Text.Json.Serialization;
 using DistributedCache.Extensions;
 using FileExporter.Extensions;
 using FluentMinimalApiMapper;
+using GridifyExtensions.Models;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using ResponseCrafter.Enums;
@@ -108,6 +110,8 @@
       return TypedResults.Ok(testTypes);
    });
 
+app.MapGet("test-query", ([FromQuery] long id) => TypedResults.Ok(id));
+
 app.MapHub<MessageHub>("/hub");
 
 app.LogStartSuccess();
@@ -120,6 +124,7 @@ public class TestTypes
       public AnimalType AnimalType { get; set; } = AnimalType.Dog;
       public required string JustText { get; set; } = "Hello";
       public int JustNumber { get; set; } = 42;
+      public string? NullableText { get; set; }
    }
 
    public enum AnimalType
diff --git a/src/SharedKernel/OpenApi/OpenApiExtensions.cs b/src/SharedKernel/OpenApi/OpenApiExtensions.cs
index f487fa8..1cd33bd 100644
--- a/src/SharedKernel/OpenApi/OpenApiExtensions.cs
+++ b/src/SharedKernel/OpenApi/OpenApiExtensions.cs
@@ -4,6 +4,7 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
+using Microsoft.OpenApi;
 using SharedKernel.Helpers;
 using SharedKernel.OpenApi.Options;
 
@@ -29,6 +30,7 @@ public static WebApplicationBuilder AddOpenApi(this WebApplicationBuilder builde
          builder.Services.AddOpenApi(document.GroupName,
             options =>
             {
+               options.OpenApiVersion = OpenApiSpecVersion.OpenApi3_0; //TODO: Change someday when swagger will be upgraded
                options.AddDocumentTransformer<RemoveServersTransformer>();
                options.AddDocument(document, openApiConfiguration);
                options.AddSchemaTransformer<EnumSchemaTransformer>();
diff --git a/src/SharedKernel/SharedKernel.csproj b/src/SharedKernel/SharedKernel.csproj
index 41b4c1c..2b1ab8f 100644
--- a/src/SharedKernel/SharedKernel.csproj
+++ b/src/SharedKernel/SharedKernel.csproj
@@ -8,13 +8,13 @@
         <PackageReadmeFile>Readme.md</PackageReadmeFile>
         <Authors>Pandatech</Authors>
         <Copyright>MIT</Copyright>
-        <Version>2.1.2</Version>
+        <Version>2.1.3</Version>
         <PackageId>Pandatech.SharedKernel</PackageId>
         <Title>Pandatech Shared Kernel Library</Title>
         <PackageTags>Pandatech, shared kernel, library, OpenAPI, Swagger, utilities, scalar</PackageTags>
         <Description>Pandatech.SharedKernel provides centralized configurations, utilities, and extensions for ASP.NET Core projects. For more information refere to readme.md document.</Description>
         <RepositoryUrl>https://github.com/PandaTechAM/be-lib-sharedkernel</RepositoryUrl>
-        <PackageReleaseNotes>Swagger headers bug fix</PackageReleaseNotes>
+        <PackageReleaseNotes>Open API SPEC 3.1 downgraded to 3.0 for better compatability. Later when swagger will support we will bump it up.</PackageReleaseNotes>
 
 
         <!-- Never run analyzers as part of compilation (local, CI, dotnet build/test/publish) -->
@@ -43,7 +43,7 @@
         <PackageReference Include="Elastic.CommonSchema.Serilog" Version="9.0.0"/>
         <PackageReference Include="FluentDateTime" Version="3.0.0"/>
         <PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="12.1.1"/>
-        <PackageReference Include="HtmlSanitizer" Version="9.0.889"/>
+        <PackageReference Include="HtmlSanitizer" Version="9.0.892" />
         <PackageReference Include="MediatR" Version="[12.5.0]"/>
         <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.2"/>
         <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="10.0.2"/>
@@ -65,14 +65,14 @@
         <PackageReference Include="Pandatech.FluentMinimalApiMapper" Version="3.0.1"/>
         <PackageReference Include="Pandatech.PandaVaultClient" Version="5.0.1"/>
         <PackageReference Include="Pandatech.ResponseCrafter" Version="6.0.1"/>
-        <PackageReference Include="Scalar.AspNetCore" Version="2.12.24" />
+        <PackageReference Include="Scalar.AspNetCore" Version="2.12.36" />
         <PackageReference Include="Serilog.AspNetCore" Version="10.0.0"/>
         <PackageReference Include="Serilog.Sinks.Async" Version="2.1.0"/>
         <PackageReference Include="Serilog.Sinks.Grafana.Loki" Version="8.3.2"/>
-        <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="10.1.0"/>
+        <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="10.1.2" />
 
         <PackageReference Include="Pandatech.Analyzers" Version="2.1.0"/>
-        <PackageReference Include="SonarAnalyzer.CSharp" Version="10.18.0.131500">
+        <PackageReference Include="SonarAnalyzer.CSharp" Version="10.19.0.132793">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>