[FEATURE query-params] Fix history location
Merge pull request #3439 from alexspeller/fix-history-location

[FEATURE query-params] Fix history location