Add all search
Add todo
Fix search class
Fix imports
Merge branch 'api'