Fix default templates, especially for cases where no data is present