working version with autocomplete v0.11
a little cleanup