fixing autocomplete
removing templates