diff --git a/defaults/main/2_site.yml b/defaults/main/2_site.yml
index 62469fc..6613e51 100644
--- a/defaults/main/2_site.yml
+++ b/defaults/main/2_site.yml
@@ -15,7 +15,7 @@ defaults_site:
   plain_site: true  # if http site (only used for redirect to https) should be created
   plain_only: false  # only create http site (behind other proxy)
   plain_redirect: 'preserve_domain'  # keep hostname from plain request => any other value will set the redirect to the main-domain
-  main_redirect: false  # redirect all requests to the primary site-domain
+  main_redirect: false  # redirect all requests to the primary site-domain (canonical)
 
   config: {}  # site-specific setting-value pairs
   config_additions: []  # lines that will 1-to-1 be appended to the site-config (directory config etc.)
diff --git a/templates/etc/nginx/sites-available/inc/site_https.j2 b/templates/etc/nginx/sites-available/inc/site_https.j2
index 6dd671b..d17027d 100644
--- a/templates/etc/nginx/sites-available/inc/site_https.j2
+++ b/templates/etc/nginx/sites-available/inc/site_https.j2
@@ -81,7 +81,7 @@ server {
 
 {% elif site.mode in ['serve', 'server'] %}
     # serve-mode config
-    try_files $uri $uri/ /{{ site.serve.index[0] | default(site.server.index[0]) }} =404;
+    try_files $uri $uri.html $uri/ /{{ site.serve.index[0] | default(site.server.index[0]) }} =404;
 {% endif %}
 
 {% if site.config_additions_root | length > 0 %}