diff --git a/es_mapping.yml b/es_mapping.yml
index a46718e..28462f6 100644
--- a/es_mapping.yml
+++ b/es_mapping.yml
@@ -51,7 +51,7 @@ settings:
 
     filter:
       my_ngram:
-        type: edgeNGram
+        type: edge_ngram
         min_gram: 1
         max_gram: 15
       fullword_min:
diff --git a/nyaa/templates/search_results.html b/nyaa/templates/search_results.html
index 25b7142..76ac131 100644
--- a/nyaa/templates/search_results.html
+++ b/nyaa/templates/search_results.html
@@ -17,7 +17,7 @@
 {% endif %}
 {% endif %}
 
-{% if (use_elastic and torrent_query.hits.total > 0) or (torrent_query.items) %}
+{% if (use_elastic and torrent_query.hits.total.value > 0) or (torrent_query.items) %}
 <div class="table-responsive">
 	<table class="table table-bordered table-hover table-striped torrent-list">
 		<thead>
diff --git a/nyaa/views/main.py b/nyaa/views/main.py
index 8dfe38f..a1dae5a 100644
--- a/nyaa/views/main.py
+++ b/nyaa/views/main.py
@@ -167,7 +167,7 @@ def home(rss):
         else:
             rss_query_string = _generate_query_string(
                 search_term, category, quality_filter, user_name)
-            max_results = min(max_search_results, query_results['hits']['total'])
+            max_results = min(max_search_results, query_results['hits']['total']['value'])
             # change p= argument to whatever you change page_parameter to or pagination breaks
             pagination = Pagination(p=query_args['page'], per_page=results_per_page,
                                     total=max_results, bs_version=3, page_parameter='p',