homepage fix & search fix