Better querystring setter
Cosmetic
Fixing tests after core changes