Fix search

Sorry for a flawed pull request earlier - the admin would break if someone tried to manually add `?q=whatever` to the url. This is the fix.