Got the right behavior of the search toolbar. Implementing the actual search remains to be done.