Further improve autocomplete

Also see SOLR-4309