autocomplete working better, still needs template for values