2811 preserve params on clearfilter

2811 Clear Filters button should preserve custom query params
I didn't combine them just to keep the line of code from becoming too long.  Filter is a match from `commit=Filter`