issue #20474: use query parameters if they're there