Large changes in advanced search (partly made, broken)