Fixed issue with html template selection