autocomplete / search cleanup