Waston search implemented properly.
fix: files generated in wrong file names.