In httpd redirecting and preserving the query parameters.

[Peter Fraser]

                location match "^(.*)[.]shtml$" {
                                block return 301 
"https://$SERVER_NAME%1.htm?$QUERY_STRING";
                }

I used the above to change and web address ending in .shtml to the same ending 
in .htm

The redirect went to the right spot, but each  '&' got converted to '%26' in 
the query string.

So how do I do such a redirect?