Improve autocomplete regex