Close #656 - fix find filter.