TOOLS-3 (Improvement - In progress) Implement a Search Toolbar