Added Top week, refactoring of search function