Search selection management, WIP