Reduce method complexity in AutocompleteController

Merged Douwe Maan requested to merge flog into master