finish refactor of improved find feature