added autocomplete & advanced options