Performance improvements

Count omitted when using fuzzy search (speeds up things a lot!)