diff --git a/tiptapy/__init__.py b/tiptapy/__init__.py
index d7092b5..39f8180 100644
--- a/tiptapy/__init__.py
+++ b/tiptapy/__init__.py
@@ -1,19 +1,21 @@
+import json
 import os
 import sys
-import json
 from html import escape
-from jinja2 import FileSystemLoader, Environment, select_autoescape
 from typing import Dict
+
+from jinja2 import Environment, FileSystemLoader, select_autoescape
+
 from .image import url2mime
 from .macros import (
-    make_img_src,
     build_link_handler,
     get_audio_player_block,
     get_doc_block,
+    make_img_src,
+    quote_plus,
 )
 
-
-__version__ = "0.17.0"
+__version__ = "0.18.0"
 
 renderers: Dict = {}
 
@@ -31,6 +33,7 @@ def init_env(path, config):
     env.globals["escape"] = escape
     env.globals["get_audio_player_block"] = get_audio_player_block
     env.globals["get_doc_block"] = get_doc_block
+    env.globals["quote_plus"] = quote_plus
 
     return env
 
diff --git a/tiptapy/macros.py b/tiptapy/macros.py
index 3c8a053..ded7a05 100644
--- a/tiptapy/macros.py
+++ b/tiptapy/macros.py
@@ -1,19 +1,21 @@
 import pkgutil
 from html import escape
-from urllib.parse import urlparse
 from string import Template
+from urllib.parse import quote_plus, urlparse
 
 
 def make_img_src(attrs):
     alt = attrs.get("alt", "").strip()
     height = attrs.get("height", "")
     width = attrs.get("width", "")
-    fallback_url = attrs["src"]["fallback"]
+    fallback_url = quote_plus(attrs["src"]["fallback"]).strip()
     image_src = f'img src="{fallback_url}"'
     if alt:
         image_src += f' alt="{escape(alt)}"'
-    if height and width:
-        image_src += f'width="{width}" height="{height}"'
+    if width:
+        image_src += f' width="{width}"'
+    if height:
+        image_src += f' height="{height}"'
 
     return image_src
 
@@ -22,9 +24,13 @@ def build_link_handler(config):
     def handle_links(attrs):
         retval = None
         if attrs:
-            url = attrs.get("href") or ""
+            url = quote_plus(attrs.pop("href", "")).strip()
             link = urlparse(url)
-            if not link.netloc.endswith(config.DOMAIN):
+            if not (
+                link.netloc == config.DOMAIN
+                or link.netloc.endswith(f".{config.DOMAIN}")
+            ):
+                attrs["href"] = url
                 attrs["target"] = "_blank"
                 attrs["rel"] = "noopener nofollow"
             retval = " ".join(
diff --git a/tiptapy/templates/extras/audio.html b/tiptapy/templates/extras/audio.html
index db31a4c..1d6d56f 100644
--- a/tiptapy/templates/extras/audio.html
+++ b/tiptapy/templates/extras/audio.html
@@ -4,9 +4,9 @@
 
   <figure class="audio-player-container">
     {%- if caption -%}
-      <div><audio src={{node.attrs.src|trim}}></audio>{{audio_player_block}}</div><figcaption>{{escape(caption)}}</figcaption>
+      <div><audio src={{node.attrs.src|trim|quote_plus}}></audio>{{audio_player_block}}</div><figcaption>{{escape(caption)}}</figcaption>
     {%- else -%}
-      <div><audio src={{node.attrs.src|trim}}></audio>{{audio_player_block}}</div>
+      <div><audio src={{node.attrs.src|trim|quote_plus}}></audio>{{audio_player_block}}</div>
     {%- endif -%}
   </figure>
 {%- endif -%}
diff --git a/tiptapy/templates/extras/document.html b/tiptapy/templates/extras/document.html
index 03091c3..914f8d6 100644
--- a/tiptapy/templates/extras/document.html
+++ b/tiptapy/templates/extras/document.html
@@ -1,7 +1,7 @@
 {%- set caption = node.attrs.caption|trim -%}
-{%- set src = node.attrs.src|trim -%}
+{%- set src = node.attrs.src|trim|quote_plus -%}
 {%- set size = node.attrs.size|trim -%}
-{%- set fname = node.attrs.name|trim -%}
+{%- set fname = node.attrs.name|trim|quote_plus -%}
 {%- set ext = node.attrs.format|trim -%}
 {%- if src and size and fname and ext -%}
   {%- set doc_block = get_doc_block(ext, fname, size, src) -%}
diff --git a/tiptapy/templates/extras/featuredimage.html b/tiptapy/templates/extras/featuredimage.html
index a1b06a7..e153015 100644
--- a/tiptapy/templates/extras/featuredimage.html
+++ b/tiptapy/templates/extras/featuredimage.html
@@ -1,7 +1,7 @@
 {%- if node.attrs.src -%}
-  {%- set image_url = node.attrs.src.image -%}
+  {%- set image_url = node.attrs.src.image|trim|quote_plus -%}
   {%- set image_type = url2mime(image_url) -%}
-  {%- set fallback_url = node.attrs['src']['fallback'] -%}
+  {%- set fallback_url = node.attrs.src.fallback|trim|quote_plus -%}
   {%- set fallback_type = url2mime(fallback_url) -%}
 
   {%- set caption = node.attrs.caption|trim -%}
diff --git a/tiptapy/templates/image.html b/tiptapy/templates/image.html
index 8d3dc83..3108df7 100644
--- a/tiptapy/templates/image.html
+++ b/tiptapy/templates/image.html
@@ -3,9 +3,9 @@
   {%- set alt = node.attrs.alt|trim -%}
   {%- set height = node.attrs.height -%}
   {%- set width = node.attrs.width -%}
-  {%- set image_url = node.attrs.src.image -%}
+  {%- set image_url = node.attrs.src.image|trim|quote_plus -%}
   {%- set image_type = url2mime(image_url) -%}
-  {%- set fallback_url = node.attrs['src']['fallback'] -%}
+  {%- set fallback_url = node.attrs.src.fallback|trim|quote_plus -%}
   {%- set fallback_type = url2mime(fallback_url) -%}
 
   {%- if image_url or fallback_url -%}