References/autocomplete: improvements
Merge branch 'master' of github.com:TrueOrFalse/TrueOrFalse