Fix handling of short fuzzy queries

Change-Id: Iebdb1277268203309dde74a76506ce8a754636b4