Redir with query string, but without question mark if no qs are set

Help
1

Hello,
I am trying to figure out, if such behaviour is optimal for caddy.

It handles redirecting with query string when using urls without final slash.

Simple:

redir "/random-dummy-url" "/other-url{query}" permanent

failed. Question mark was missing.

Or maybe there is better option than below?

map {query} {cond_query} {
    ~(.+)   "?${1}"
    default   ""
}
# from plain redirect id 7
redir "/random-dummy-url" "/other-url{cond_query}" permanent