- restructure advanced search for new gui components