Added option to filter tools