Clean up: improve organization of parameters with current search box.