tweak regexp to work more reliably
tweak regexp to work more reliably

Search for non-firsts before checking for a first, since the rewrite
won't be picked up.
Also fix the case of a single URL param not being removed.

rahulg/deurchin,rahulg/deurchin