diff --git a/server.py b/server.py
index abb2301..d28c139 100644
--- a/server.py
+++ b/server.py
@@ -41,7 +41,7 @@ def articles():
                     "date":         article[1],
                     "place":        article[2],
                     "description":  article[3],
-                    "categories":   [article[4]],
+                    "categories":   [article[4]] if article[4] else [],
                     "lat":          locations[article_id][0],
                     "lng":          locations[article_id][1],
                     "place":        locations[article_id][2]
diff --git a/static/js/filter.js b/static/js/filter.js
index e5a8e40..7089448 100644
--- a/static/js/filter.js
+++ b/static/js/filter.js
@@ -8,11 +8,16 @@ export default {
    */
   byCategories: function (data, categories) {
     return data.filter(function (incident) {
-      for (var i = 0, l = incident.categories.length; i < l; i++)
-        if (categories.indexOf(incident.categories[i]) !== -1)
+      if(incident.categories.length > 0) {
+        for (var i = 0, l = incident.categories.length; i < l; i++)
+          if (categories.indexOf(incident.categories[i]) !== -1)
+            return true
+      } else {
+        if(categories.indexOf("uncategorized") !== -1)
           return true
-
-      return false
+        else
+          return false
+      }
     });
   },