diff --git a/src/app.ml b/src/app.ml
index ec84d50..afc1afe 100644
--- a/src/app.ml
+++ b/src/app.ml
@@ -87,4 +87,4 @@ let get_dirs name =
 
 let admins = get_dirs "admin"
 
-let categories = get_dirs "category"
+let categories = List.sort_uniq compare (get_dirs "category")
diff --git a/src/permap.ml b/src/permap.ml
index 0f340c9..12f4adc 100644
--- a/src/permap.ml
+++ b/src/permap.ml
@@ -350,7 +350,16 @@ let babillard_post request =
         ; ("subject", [ (_, subject) ])
         ; ("tags", [ (_, tags) ])
         ; ("thread-comment", [ (_, comment) ])
-        ] -> (
+        ]
+    | `Ok
+        (("alt", [ (_, alt) ])
+        :: ("file", file)
+           :: ("lat-input", [ (_, lat) ])
+              :: ("lng-input", [ (_, lng) ])
+                 :: ("subject", [ (_, subject) ])
+                    :: ("tags", [ (_, tags) ])
+                       :: ("thread-comment", [ (_, comment) ])
+                          :: ([] as categories) ) -> (
       let categories =
         List.map (fun (_name, category) -> category) categories
       in