CF-114 I've pulled out too much code out, this make autocomplete work on the desktop again.