Improve autocompleting rules