fixed broken validation with extra params in querystring (+1 squashed commit)
Squashed commits:
[1f996c2] tests for extra params in querystring