Further code cleanup for multi-tab-search feature