Continued work on quick-find-bar