Take advantage of addExtraAutocompleteCriteria