Search Widget Rework