Autocomplete, extraction improvements, fix hang bug