Some simplifying of code in light of tests. Changed AutoCOmpleteAdapter to StringFilterAdapter as adapter was more general.