Fix searching a second time bug #511

The whole going through redirects every time with search feels a bit nasty.  Would be good to factor that out but that's a job for another time. ;-)