Make search work more clearly now that it's on toolbar

Fixes #2242 and related cleanups