autocomplete imporved. Condition bugfix