Added fuzzy filtering
Aesthetic changes