finalized autocomplete issue #18