Added support for fuzzy finder