seperated search into seperate page, mild improvments