Ditched middleware
Merge branch 'autocomplete-middleware'