Fixed search, added redirect