diff --git a/pytest_mpl/summary/html.py b/pytest_mpl/summary/html.py
index 0f30566d..af87e39a 100644
--- a/pytest_mpl/summary/html.py
+++ b/pytest_mpl/summary/html.py
@@ -93,8 +93,9 @@ def __init__(self, name, item, id):
 
         # Name of test with module and test function together and separate
         self.full_name = name
-        self.name = name.split('.')[-1]
-        self.module = '.'.join(name.split('.')[:-1])
+        without_parametrized_name = name.split("[")[0]
+        self.module = ".".join(without_parametrized_name.split(".")[:-1])
+        self.name = name[len(self.module)+1:]
 
         # Additional classes to add to the result card
         self.classes = [f'{k}-{str(v).lower()}' for k, v in [
diff --git a/pytest_mpl/summary/templates/basic.html b/pytest_mpl/summary/templates/basic.html
index 27e6417c..1dfe55ef 100644
--- a/pytest_mpl/summary/templates/basic.html
+++ b/pytest_mpl/summary/templates/basic.html
@@ -73,7 +73,7 @@ <h2>Image test comparison</h2>
             {%- endif %}
         </td>
         {% macro image(file) -%}
-        <td>{% if file %}<img src="{{ file }}">{% endif %}</td>
+        <td>{% if file %}<img src="{{ file | urlencode }}">{% endif %}</td>
         {%- endmacro -%}
         {{ image(result.baseline_image) }}
         {{ image(result.diff_image) }}
diff --git a/pytest_mpl/summary/templates/result.html b/pytest_mpl/summary/templates/result.html
index 6e7986bd..6c5dd9e3 100644
--- a/pytest_mpl/summary/templates/result.html
+++ b/pytest_mpl/summary/templates/result.html
@@ -12,19 +12,19 @@
             <div class="hover-image">
                 {% if r.diff_image -%}
                 <div class="diff-image">
-                    <img src="{{ r.diff_image }}" class="card-img-top" alt="diff image">
+                    <img src="{{ r.diff_image | urlencode }}" class="card-img-top" alt="diff image">
                 </div>
                 <div class="result-image">
-                    <img src="{{ r.result_image }}" class="card-img-top" alt="result image">
+                    <img src="{{ r.result_image | urlencode }}" class="card-img-top" alt="result image">
                 </div>
                 {%- else -%}
-                <img src="{{ r.result_image }}" class="card-img-top" alt="result image">
+                <img src="{{ r.result_image | urlencode }}" class="card-img-top" alt="result image">
                 {%- endif %}
             </div>
             {%- elif r.result_image -%}
-            <img src="{{ r.result_image }}" class="card-img-top" alt="result image">
+            <img src="{{ r.result_image | urlencode }}" class="card-img-top" alt="result image">
             {%- elif r.baseline_image -%}
-            <img src="{{ r.baseline_image }}" class="card-img-top" alt="baseline image">
+            <img src="{{ r.baseline_image | urlencode }}" class="card-img-top" alt="baseline image">
             {%- endif %}
         </a>
         {% filter indent(width=8) -%}
diff --git a/pytest_mpl/summary/templates/result_images.html b/pytest_mpl/summary/templates/result_images.html
index 36ab2943..37d4590b 100644
--- a/pytest_mpl/summary/templates/result_images.html
+++ b/pytest_mpl/summary/templates/result_images.html
@@ -13,7 +13,7 @@ <h5 class="card-title">{{ r.name }}</h5>
                 <div class="card h-100">
                     <div class="card-header">{{ name }}</div>
                     {% if file -%}
-                    <img src="{{ file }}" class="card-img-top" alt="{{ name }}">
+                    <img src="{{ file | urlencode }}" class="card-img-top" alt="{{ name }}">
                     {%- endif %}
                 </div>
             </div>