GUI search: reorg, step 1