Retain query string through redirect

I see the current approach (with a "Retain query string through redirect" checkbox) quite incomplete (unflexible). It makes sense in case there is a redirect without any query entered. If there is a redirect query, it is quite obvious that it should replace the current (received) query.

But, what about the situation where there is a redirect source query present, but no destination query defined? Would't it be logical to expect that in such cases we don't always want the query to be retained? Meaning that there can be a case where exactly URL with just a certain query should be redirected to some other address, but without any query part?

I believe "Retain query string through redirect" checkbox shouldn't be a general option, but an option attached to each particular redirect (there can however be a general option, but to be used just as a default value...). This way we could have in one environment redirects where the query part is preserved (retained), as well as some others where it is not...