Adapt to the new iterator class.
New search GUI (work in progress).