added  fuzzy etype search and minor fixes