Search Panel Fixes