bugfix in template and added todo