HH-44915 fix urls with incorrectly encoded query string