Bugfix: adds all the elements in the template now