diff --git a/internal/answerwc/template/to_client.tmpl b/internal/answerwc/template/to_client.tmpl
index 2c98634..7450cbb 100644
--- a/internal/answerwc/template/to_client.tmpl
+++ b/internal/answerwc/template/to_client.tmpl
@@ -483,7 +483,7 @@
       </tr>
 
       {{ range .AllAnswers }}
-        {{ if index $.QuestionsMap .AnswerID }}
+        {{ if keyExists $.QuestionsMap .AnswerID }}
         <tr>
           <td colspan="2" style="padding: 0">
             <table
diff --git a/internal/senders/common.go b/internal/senders/common.go
index c779002..ad5e73d 100644
--- a/internal/senders/common.go
+++ b/internal/senders/common.go
@@ -6,9 +6,10 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
+	"gitea.pena/SQuiz/common/model"
 	"golang.org/x/net/html"
 	"html/template"
-	"gitea.pena/SQuiz/common/model"
+	"io"
 	"strings"
 )
 
@@ -54,6 +55,10 @@ func generateTextFromTemplate(data TemplateData, tpl string) (string, error) {
 }
 
 var tmplFuncs = template.FuncMap{
+	"keyExists": func(m map[uint64]string, key uint64) bool {
+		_, ok := m[key]
+		return ok
+	},
 	"renderImage": RenderImage,
 }
 
@@ -74,7 +79,7 @@ func RenderImage(content string) template.HTML {
 		if err != nil {
 			return SplitContent(content)
 		} else {
-			builder.WriteString(fmt.Sprintf("<td>%s<br><img class=\"image\" style=\"width:100%%; max-width:250px; max-height:250px\" src=\"%s\"/></td>", res.Description, strings.Replace(res.Image,"http","https",1)))
+			builder.WriteString(fmt.Sprintf("<td>%s<br><img class=\"image\" style=\"width:100%%; max-width:250px; max-height:250px\" src=\"%s\"/></td>", res.Description, strings.Replace(res.Image, "http", "https", 1)))
 		}
 	}
 
@@ -105,7 +110,7 @@ func sanitizeHTMLData(data TemplateData) TemplateData {
 		AllAnswers:    stripHTMLResultAnswers(data.AllAnswers),
 		QuestionsMap:  stripHTMLResultMap(data.QuestionsMap),
 		AnswerTime:    StripHTML(data.AnswerTime),
-		QuizID:				 data.QuizID,
+		QuizID:        data.QuizID,
 	}
 	return sanitized
 }
diff --git a/tests/mail/to_client.tmpl b/tests/mail/to_client.tmpl
index fe36b93..7450cbb 100644
--- a/tests/mail/to_client.tmpl
+++ b/tests/mail/to_client.tmpl
@@ -80,6 +80,7 @@
       <tr>
         <td colspan="2" style="height: 100%">
           <a
+					href="https://quiz.pena.digital/results/{{ .QuizID }}"
             style="
               display: flex;
               justify-content: center;
@@ -482,7 +483,7 @@
       </tr>
 
       {{ range .AllAnswers }}
-        {{ if index $.QuestionsMap .AnswerID }}
+        {{ if keyExists $.QuestionsMap .AnswerID }}
         <tr>
           <td colspan="2" style="padding: 0">
             <table