MAL-79 | Finish autocomplete