Fix autocomplete default handling
Merge pull request #321 from CloudNiner/topic/autocomplete

Fix autocomplete default handling