Improve search
Fix dropdown menu for tools