Better job of scrubbing all params coming in either by sef or query url [#1230]