fixed autocomplete layout, new separate template-file, separated version from other options