File watcher

Merge current search with master to enable testing search with gui&api.