code refactoring, each tab have it own class. Improved display of search result