Fix issue where passing URL with query string via named arguments lost query string parameters