JJ/HM: Added autocomplete