Decode query string before returning
Merge branch 'hotfix-querystring' into develop