Convert query_params to a map
Merge pull request #2812 from gsathya/query_params

Convert query_params to a map