GUI search: reorg mostly OK