Bug fixes: empty template (coming soon)