diff --git a/site/themes/default/templates/blog.html b/site/themes/default/templates/blog.html
index 3acd7176..3f515dad 100644
--- a/site/themes/default/templates/blog.html
+++ b/site/themes/default/templates/blog.html
@@ -6,14 +6,14 @@
 
     {# pagination #}
     {% set entries_limit = entries.fetch('blog').entries_limit %}
-    {% set entries_length = entries.fetchAll('blog', 'date', 'DESC')|length %}
+    {% set entries_length = entries.fetchAll('blog', {'order_by': {'field': 'date', 'direction': 'desc'}})|length %}
     {% set entries_pages = (entries_length/entries_limit)|round %}
     {% if page < 1 %}{% set page = 1 %}{% elseif page > entries_pages %}{% set page = entries_pages %}{% endif %}
     {% set entries_offset = (page-1)*entries_limit %}
     {% if entries_offset < 0 %}{% set entries_offset = 0 %}{% endif %}
     {# /pagination #}
 
-    {% for entry in entries.fetchAll('blog', 'date', 'DESC', entries_offset, entries_limit) %}
+    {% for entry in entries.fetchAll('blog', {'order_by': {'field': 'date', 'direction': 'desc'}, 'set_max_result': entries_limit, 'set_first_result': entries_offset}) %}
         <a href="{{ entry.slug }}" class="blog-post">
             <h3>{{ entry.title }}</h3>
             <p>{{ entry.summary|shortcode|raw}}</p>
diff --git a/site/themes/default/templates/home.html b/site/themes/default/templates/home.html
index c52152a3..38f98034 100644
--- a/site/themes/default/templates/home.html
+++ b/site/themes/default/templates/home.html
@@ -4,7 +4,7 @@
 
     {{ entry.content|shortcode|raw}}
 
-    {% for entry in entries.fetchAll('blog', 'date', 'DESC', 0, 3) %}
+    {% for entry in entries.fetchAll('blog', {'order_by': {'field': 'date', 'direction': 'desc'}, 'set_max_result': '3'}) %}
         <a href="{{ entry.slug }}" class="blog-post">
             <h3>{{ entry.title }}</h3>
             <p>{{ entry.summary|shortcode|raw}}</p>
diff --git a/site/themes/default/templates/partials/base.html b/site/themes/default/templates/partials/base.html
index 1336ab2a..91a1a436 100644
--- a/site/themes/default/templates/partials/base.html
+++ b/site/themes/default/templates/partials/base.html
@@ -36,7 +36,7 @@
           </button>
           <div class="collapse navbar-collapse justify-content-end" id="navbarNav">
             <ul class="navbar-nav">
-                {% for item in entries.fetchAll('', 'menu_item_order', 'ASC') %}
+                {% for item in entries.fetchAll('', {'order_by': {'field': 'menu_item_order', 'direction': 'asc'}}) %}
                     {% if item.menu_item_title %}
                         <li class="nav-item">
                             <a class="nav-link {% if item.menu_item_url in entry.slug %}active{% endif %}" href="{{ base_url() }}/{{ item.menu_item_url }}">{{ item.menu_item_title }}</a>