initial work for search and fix wrong import paths