fix templates
refactor find & index