Add fuzzy lookups for -i and -d