first checkin of autocomplete support