unfinished commit: updated autocomplete adapter + in the middle of refactoring expanded term code