Some fixes and renaming
Searchtab almost finalized