more autocomplete work
clean up search a bit