Made autocomplete a bit better