More work on autocomplete... getting closer but still not quite working correctly.  Just a tiedown point.