fulltext search in evaluation + refactorings;