Fix query string problem #2078 with CListView and CGridView when enableHistory=true
Merge pull request #2079 from Parpaing/2078-fix-for-CListView-and-CGridView-query-string-bug

Fix query string problem with CListView and CGridView
[ci skip]