Improve read autocomplete