Fix #71: Template selection has non-empty default
Merge branch 'bugfix/71'