Fixed params should have higher priority than Query
Merge pull request #504 from mcheng89/develop

Fix for query param override issue (#503)