Adding partial autocomplete support