Updated Search handler and GUISearch