refactoring, template search,readmodel drop