Restructure search