Remove log
Add missing files for search logic and fix bugs