Issue #2280559: Fix for broken querystring parameter context