Fixing search and search redirect