Add support for explicit identification of query params (breaks build) (issue #6) [ci skip]