Web server config: redirect canonical URLs to language-specific versions

modules/web/templates/site.erb

 server
 {
   listen 80 default_server;
   listen [::]:80 default_server;
   server_name '<%= vhost %>';
 
   location /
   {
     rewrite (.*) https://<%= vhost %>$1 permanent;
   }
@@ skipping 54 matching lines @@
   if (-d $request_filename)
   {
     break;
   }
 
   # Redirect canonical URLs to language-specific versions
 
   set $canonical $uri;
   if ($canonical ~ ^(.*?)\?)
   {
-
+    set $canonical $1;
   }
 
   if (-f $document_root/$preferredLang$canonical)
   {
     rewrite ^ /$preferredLang$canonical last;
   }
   if (-f $document_root/en$canonical)
   {
     rewrite ^ /en$canonical last;
   }
 }