Fixed JSONs, added template for autocomplete