Merge pull request #689 from YAndrew91/qs-bugfixes

Bigfixes and improvements for query params processing
Merge branch 'master' into dev