SearchPanel refactored