diff --git a/content/faq/android-version.md b/content/faq/android-01-version.md
similarity index 97%
rename from content/faq/android-version.md
rename to content/faq/android-01-version.md
index cf8da4c4..d0af5b10 100644
--- a/content/faq/android-version.md
+++ b/content/faq/android-01-version.md
@@ -1,13 +1,13 @@
 ---
 title: "F.A.Q. - Android"
 description: "Frequently asked questions for Organic Maps application"
-weight: 1000
 
 taxonomies:
   faq: ["Android"]
 
 extra:
   question: What Android version can run OrganicMaps?
+  order: 10
 ---
 
 You need at leat Android 5 to run the app. All devices with latest Android can run OrganicMaps. If you want to use AndroidAuto then minimal version is Android 6+.
diff --git a/content/faq/android-fdroid.md b/content/faq/android-02-fdroid.md
similarity index 97%
rename from content/faq/android-fdroid.md
rename to content/faq/android-02-fdroid.md
index 8e5165d3..5c2169fc 100644
--- a/content/faq/android-fdroid.md
+++ b/content/faq/android-02-fdroid.md
@@ -1,13 +1,13 @@
 ---
 title: "F.A.Q. - Android"
 description: "Frequently asked questions for Organic Maps application"
-weight: 1000
 
 taxonomies:
   faq: ["Android"]
 
 extra:
   question: What's the difference between F-Droid and Google Play versions of tha app?
+  order: 20
 ---
 
 F-Droid version comes without [Google Play Services](https://en.wikipedia.org/wiki/Google_Play_Services). These Services improve location accuracy using nearest cell towers and wifi hotspots if internet connection is available. F-Droid version uses only device GPS sensor.
diff --git a/content/faq/android-lags.md b/content/faq/android-03-lags.md
similarity index 97%
rename from content/faq/android-lags.md
rename to content/faq/android-03-lags.md
index fdb11ae4..debe6999 100644
--- a/content/faq/android-lags.md
+++ b/content/faq/android-03-lags.md
@@ -1,13 +1,13 @@
 ---
 title: "F.A.Q. - Android"
 description: "Frequently asked questions for Organic Maps application"
-weight: 1000
 
 taxonomies:
   faq: ["Android"]
 
 extra:
   question: Why OrganicMaps is slow on my device, UI is laggy, and it crashes randomly?
+  order: 30
 ---
 
 Most likely you configured to store maps data on SD card. Usually switchable SD cards in Android phones are slow and unreliable.
diff --git a/content/faq/android-logs.md b/content/faq/android-04-logs.md
similarity index 97%
rename from content/faq/android-logs.md
rename to content/faq/android-04-logs.md
index 7eab2673..78e6b9fb 100644
--- a/content/faq/android-logs.md
+++ b/content/faq/android-04-logs.md
@@ -1,13 +1,13 @@
 ---
 title: "F.A.Q. - Android"
 description: "Frequently asked questions for Organic Maps application"
-weight: 1000
 
 taxonomies:
   faq: ["Android"]
 
 extra:
   question: How to enable logs?
+  order: 40
 ---
 
 If you want to report a bug then additional app logs could help locate a problem.
diff --git a/content/faq/android-webview.md b/content/faq/android-05-webview.md
similarity index 94%
rename from content/faq/android-webview.md
rename to content/faq/android-05-webview.md
index 01f056eb..d79abca6 100644
--- a/content/faq/android-webview.md
+++ b/content/faq/android-05-webview.md
@@ -1,13 +1,13 @@
 ---
 title: "F.A.Q. - Android"
 description: "Frequently asked questions for Organic Maps application"
-weight: 1000
 
 taxonomies:
   faq: ["Android"]
 
 extra:
   question: What if app crashes on start?
+  order: 50
 ---
 
 You need to enable Android WebView component.
diff --git a/content/faq/bookmarks-edit.md b/content/faq/bookmarks-01-edit.md
similarity index 97%
rename from content/faq/bookmarks-edit.md
rename to content/faq/bookmarks-01-edit.md
index 4859b1fc..2195441c 100644
--- a/content/faq/bookmarks-edit.md
+++ b/content/faq/bookmarks-01-edit.md
@@ -1,13 +1,13 @@
 ---
 title: "F.A.Q. - Bookmarks and tracks"
 description: "Frequently asked questions for Organic Maps application"
-weight: 1000
 
 taxonomies:
   faq: ["Bookmarks"]
 
 extra:
   question: How to edit or move bookmarks?
+  order: 10
 ---
 
 To edit a bookmark use longtap menu or hit "Edit bookmark" when bookmark is selected on map.
diff --git a/content/faq/bookmarks-remove.md b/content/faq/bookmarks-02-remove.md
similarity index 95%
rename from content/faq/bookmarks-remove.md
rename to content/faq/bookmarks-02-remove.md
index 693ce1ed..0fb92067 100644
--- a/content/faq/bookmarks-remove.md
+++ b/content/faq/bookmarks-02-remove.md
@@ -1,13 +1,13 @@
 ---
 title: "F.A.Q. - Bookmarks and tracks"
 description: "Frequently asked questions for Organic Maps application"
-weight: 1000
 
 taxonomies:
   faq: ["Bookmarks"]
 
 extra:
   question: How to remove bookmark or track?
+  order: 20
 ---
 
 On Android you can remove bookmark from from bookmarks list using longtap menu.
diff --git a/content/faq/bookmarks-import-android.md b/content/faq/bookmarks-03-import-android.md
similarity index 97%
rename from content/faq/bookmarks-import-android.md
rename to content/faq/bookmarks-03-import-android.md
index 010aca6c..3923b86d 100644
--- a/content/faq/bookmarks-import-android.md
+++ b/content/faq/bookmarks-03-import-android.md
@@ -1,13 +1,13 @@
 ---
 title: "F.A.Q. - Bookmarks and tracks"
 description: "Frequently asked questions for Organic Maps application"
-weight: 1000
 
 taxonomies:
   faq: ["Bookmarks"]
 
 extra:
   question: How to import multiple bookmarks on Android?
+  order: 30
 ---
 
 <img src="/images/faq/faq-bookmarks-android-import.jpg" width="400px"/>
diff --git a/content/faq/bookmarks-import-gpx.md b/content/faq/bookmarks-04-import-gpx.md
similarity index 98%
rename from content/faq/bookmarks-import-gpx.md
rename to content/faq/bookmarks-04-import-gpx.md
index 00e9316e..b5172ca3 100644
--- a/content/faq/bookmarks-import-gpx.md
+++ b/content/faq/bookmarks-04-import-gpx.md
@@ -1,13 +1,13 @@
 ---
 title: "F.A.Q. - Bookmarks and tracks"
 description: "Frequently asked questions for Organic Maps application"
-weight: 1000
 
 taxonomies:
   faq: ["Bookmarks"]
 
 extra:
   question: Hot to import GPX track on Android and iOS?
+  order: 40
 ---
 
 If you recieved GPX file in email, messenger, or cloud drive you can import it directly to OrganicMaps app.
diff --git a/content/faq/bookmarks-move-track.md b/content/faq/bookmarks-05-move-track.md
similarity index 95%
rename from content/faq/bookmarks-move-track.md
rename to content/faq/bookmarks-05-move-track.md
index ab054620..c1aac588 100644
--- a/content/faq/bookmarks-move-track.md
+++ b/content/faq/bookmarks-05-move-track.md
@@ -1,13 +1,13 @@
 ---
 title: "F.A.Q. - Bookmarks and tracks"
 description: "Frequently asked questions for Organic Maps application"
-weight: 1000
 
 taxonomies:
   faq: ["Bookmarks"]
 
 extra:
   question: How to move imported track to another folder?
+  order: 50
 ---
 
 On Android : ???
diff --git a/content/faq/bookmarks-files-location.md b/content/faq/bookmarks-06-files-location.md
similarity index 97%
rename from content/faq/bookmarks-files-location.md
rename to content/faq/bookmarks-06-files-location.md
index 97aa69f7..c41521b9 100644
--- a/content/faq/bookmarks-files-location.md
+++ b/content/faq/bookmarks-06-files-location.md
@@ -1,13 +1,13 @@
 ---
 title: "F.A.Q. - Bookmarks and tracks"
 description: "Frequently asked questions for Organic Maps application"
-weight: 1000
 
 taxonomies:
   faq: ["Bookmarks"]
 
 extra:
   question: How to find bookmarks and tracks files on phone?
+  order: 70
 ---
 
 Bookmarks and tracks are stored in private app folder and are not accessible from 3rd party apps.
diff --git a/content/faq/bookmarks-uninstall.md b/content/faq/bookmarks-07-uninstall.md
similarity index 97%
rename from content/faq/bookmarks-uninstall.md
rename to content/faq/bookmarks-07-uninstall.md
index 2fcc7b63..4b59b573 100644
--- a/content/faq/bookmarks-uninstall.md
+++ b/content/faq/bookmarks-07-uninstall.md
@@ -1,13 +1,13 @@
 ---
 title: "F.A.Q. - Bookmarks and tracks"
 description: "Frequently asked questions for Organic Maps application"
-weight: 1000
 
 taxonomies:
   faq: ["Bookmarks"]
 
 extra:
   question: What would happen with my bookmarks and tracks after uninstalling app?
+  order: 60
 ---
 
 All you tracks and bookmarks are removed from device when OrganicMaps is uninstalled. Please backup your bookmarks and tracks using export button.
diff --git a/content/faq/general-history.md b/content/faq/general-01-history.md
similarity index 93%
rename from content/faq/general-history.md
rename to content/faq/general-01-history.md
index beb452a7..23db4403 100644
--- a/content/faq/general-history.md
+++ b/content/faq/general-01-history.md
@@ -1,13 +1,13 @@
 ---
 title: "F.A.Q. - General questions"
 description: "Frequently asked questions for Organic Maps application"
-weight: 1000
 
 taxonomies:
   faq: ["General"]
 
 extra:
   question: Project history
+  order: 10
 ---
 
 ???
diff --git a/content/faq/general-team.md b/content/faq/general-02-team.md
similarity index 96%
rename from content/faq/general-team.md
rename to content/faq/general-02-team.md
index 98c0e9ad..0470139e 100644
--- a/content/faq/general-team.md
+++ b/content/faq/general-02-team.md
@@ -1,13 +1,13 @@
 ---
 title: "F.A.Q. - General questions"
 description: "Frequently asked questions for Organic Maps application"
-weight: 1000
 
 taxonomies:
   faq: ["General"]
 
 extra:
   question: Who is working on the project?
+  order: 20
 ---
 
 Core team consists of:
diff --git a/content/faq/general-advantages.md b/content/faq/general-03-advantages.md
similarity index 97%
rename from content/faq/general-advantages.md
rename to content/faq/general-03-advantages.md
index b0621708..90256068 100644
--- a/content/faq/general-advantages.md
+++ b/content/faq/general-03-advantages.md
@@ -1,13 +1,13 @@
 ---
 title: "F.A.Q. - General questions"
 description: "Frequently asked questions for Organic Maps application"
-weight: 1000
 
 taxonomies:
   faq: ["General"]
 
 extra:
   question: What are the advantages of OM compared to other maps?
+  order: 30
 ---
 
 OrganicMaps is focused on speed, privacy, battery efficiency and minimization of network utilization.
diff --git a/content/faq/general-updates.md b/content/faq/general-04-updates.md
similarity index 96%
rename from content/faq/general-updates.md
rename to content/faq/general-04-updates.md
index 3998d037..aee36c0f 100644
--- a/content/faq/general-updates.md
+++ b/content/faq/general-04-updates.md
@@ -1,14 +1,13 @@
 ---
 title: "F.A.Q. - General questions"
 description: "Frequently asked questions for Organic Maps application"
-weight: 1000
 
 taxonomies:
   faq: ["General"]
 
 extra:
   question: Why you should always update app to the latest version?
+  order: 40
 ---
 
 We constantly work on improvements and fixing bugs. New map data is distributed only with regular application updates.
-
diff --git a/content/faq/general-roadmap.md b/content/faq/general-05-roadmap.md
similarity index 94%
rename from content/faq/general-roadmap.md
rename to content/faq/general-05-roadmap.md
index c0f7f7c5..ba057b47 100644
--- a/content/faq/general-roadmap.md
+++ b/content/faq/general-05-roadmap.md
@@ -1,13 +1,13 @@
 ---
 title: "F.A.Q. - General questions"
 description: "Frequently asked questions for Organic Maps application"
-weight: 1000
 
 taxonomies:
   faq: ["General"]
 
 extra:
   question: What is your product roadmap?
+  order: 50
 ---
 
 Crunch till the end of our days!!
diff --git a/content/faq/general-bugreport.md b/content/faq/general-06-bugreport.md
similarity index 97%
rename from content/faq/general-bugreport.md
rename to content/faq/general-06-bugreport.md
index 526311d2..ca31e6e9 100644
--- a/content/faq/general-bugreport.md
+++ b/content/faq/general-06-bugreport.md
@@ -1,13 +1,13 @@
 ---
 title: "F.A.Q. - General questions"
 description: "Frequently asked questions for Organic Maps application"
-weight: 1000
 
 taxonomies:
   faq: ["General"]
 
 extra:
   question: How to send up a bugreport?
+  order: 60
 ---
 
 Report bugs or issues to [the issue tracker][issues] or [email us][email]. You can submit feedback directly from app.
diff --git a/content/faq/general-news.md b/content/faq/general-07-news.md
similarity index 97%
rename from content/faq/general-news.md
rename to content/faq/general-07-news.md
index a0cf3919..ec6d47a7 100644
--- a/content/faq/general-news.md
+++ b/content/faq/general-07-news.md
@@ -1,13 +1,13 @@
 ---
 title: "F.A.Q. - General questions"
 description: "Frequently asked questions for Organic Maps application"
-weight: 1000
 
 taxonomies:
   faq: ["General"]
 
 extra:
   question: Where to read latest news updates?
+  order: 70
 ---
 
 - Subscribe to our [Telegram Channel][telegram] or to the [matrix space][matrix] for updates.
diff --git a/content/faq/ios-version.md b/content/faq/ios-01-version.md
similarity index 94%
rename from content/faq/ios-version.md
rename to content/faq/ios-01-version.md
index 24199202..7f111318 100644
--- a/content/faq/ios-version.md
+++ b/content/faq/ios-01-version.md
@@ -1,13 +1,13 @@
 ---
 title: "F.A.Q. - iOS"
 description: "Frequently asked questions for Organic Maps application"
-weight: 1000
 
 taxonomies:
   faq: ["iOS"]
 
 extra:
   question: What iOS version can run OrganicMaps?
+  order: 10
 ---
 
 OrganicMaps runs on devices with iOS/iPadOS 12+.
diff --git a/content/faq/ios-carplay.md b/content/faq/ios-02-carplay.md
similarity index 95%
rename from content/faq/ios-carplay.md
rename to content/faq/ios-02-carplay.md
index a77f03d3..4d8ae2ef 100644
--- a/content/faq/ios-carplay.md
+++ b/content/faq/ios-02-carplay.md
@@ -1,13 +1,13 @@
 ---
 title: "F.A.Q. - iOS"
 description: "Frequently asked questions for Organic Maps application"
-weight: 1000
 
 taxonomies:
   faq: ["iOS"]
 
 extra:
   question: Why CarPlay is always dark?
+  order: 20
 ---
 
 Check your CarPlay settings (NOT Organic Maps settings) when the device is connected, and select "auto" instead of "always dark".
diff --git a/content/faq/map-longtap.md b/content/faq/map-01-longtap.md
similarity index 96%
rename from content/faq/map-longtap.md
rename to content/faq/map-01-longtap.md
index 37b6fa3e..7be6e311 100644
--- a/content/faq/map-longtap.md
+++ b/content/faq/map-01-longtap.md
@@ -1,13 +1,13 @@
 ---
 title: "F.A.Q. - How to use map"
 description: "Frequently asked questions for Organic Maps application"
-weight: 1000
 
 taxonomies:
   faq: ["Map"]
 
 extra:
   question: How to use Long Tap?
+  order: 10
 ---
 
 You can do a lot of thing in the app using long tap:
diff --git a/content/faq/map-legend.md b/content/faq/map-02-legend.md
similarity index 96%
rename from content/faq/map-legend.md
rename to content/faq/map-02-legend.md
index 67568a41..7244a7f1 100644
--- a/content/faq/map-legend.md
+++ b/content/faq/map-02-legend.md
@@ -1,13 +1,13 @@
 ---
 title: "F.A.Q. - How to use map"
 description: "Frequently asked questions for Organic Maps application"
-weight: 1000
 
 taxonomies:
   faq: ["Map"]
 
 extra:
   question: How to get map legend?
+  order: 20
 ---
 
 <img src="/images/faq/faq-map-legend.jpg" width="400px"/>
diff --git a/content/faq/map-maximize.md b/content/faq/map-03-maximize.md
similarity index 95%
rename from content/faq/map-maximize.md
rename to content/faq/map-03-maximize.md
index 3a091f2b..a48ae25e 100644
--- a/content/faq/map-maximize.md
+++ b/content/faq/map-03-maximize.md
@@ -1,13 +1,13 @@
 ---
 title: "F.A.Q. - How to use map"
 description: "Frequently asked questions for Organic Maps application"
-weight: 1000
 
 taxonomies:
   faq: ["Map"]
 
 extra:
   question: How to maximize map?
+  order: 30
 ---
 
 Perform single tap on empty space to hide app interface and get fullscreen map.
diff --git a/content/faq/map-gestures.md b/content/faq/map-04-gestures.md
similarity index 96%
rename from content/faq/map-gestures.md
rename to content/faq/map-04-gestures.md
index 6751c885..4b068bdf 100644
--- a/content/faq/map-gestures.md
+++ b/content/faq/map-04-gestures.md
@@ -1,13 +1,13 @@
 ---
 title: "F.A.Q. - How to use map"
 description: "Frequently asked questions for Organic Maps application"
-weight: 1000
 
 taxonomies:
   faq: ["Map"]
 
 extra:
   question: What gestures does OrganicMaps support?
+  order: 40
 ---
 
 (On iOS and iPadOS) Tap and hold on zoom buttons then drag up or down to zoom.
diff --git a/content/faq/map-one-hand-zoom.md b/content/faq/map-05-one-hand-zoom.md
similarity index 97%
rename from content/faq/map-one-hand-zoom.md
rename to content/faq/map-05-one-hand-zoom.md
index c5357e9a..8f764608 100644
--- a/content/faq/map-one-hand-zoom.md
+++ b/content/faq/map-05-one-hand-zoom.md
@@ -1,13 +1,13 @@
 ---
 title: "F.A.Q. - How to use map"
 description: "Frequently asked questions for Organic Maps application"
-weight: 1000
 
 taxonomies:
   faq: ["Map"]
 
 extra:
   question: How to zoom in/zoom out with one hand?
+  order: 50
 ---
 
 <video width="300px" controls>
diff --git a/content/faq/map-my-coordinates.md b/content/faq/map-06-my-coordinates.md
similarity index 97%
rename from content/faq/map-my-coordinates.md
rename to content/faq/map-06-my-coordinates.md
index a2686f58..517fb028 100644
--- a/content/faq/map-my-coordinates.md
+++ b/content/faq/map-06-my-coordinates.md
@@ -1,13 +1,13 @@
 ---
 title: "F.A.Q. - How to use map"
 description: "Frequently asked questions for Organic Maps application"
-weight: 1000
 
 taxonomies:
   faq: ["Map"]
 
 extra:
   question: How to get my coordinates, speed, and altitude?
+  order: 60
 ---
 
 <img src="/images/faq/faq-map-my-position.jpg" width="400px"/>
diff --git a/content/faq/map-circle.md b/content/faq/map-07-circle.md
similarity index 98%
rename from content/faq/map-circle.md
rename to content/faq/map-07-circle.md
index 984fc654..bf3bb90d 100644
--- a/content/faq/map-circle.md
+++ b/content/faq/map-07-circle.md
@@ -1,13 +1,13 @@
 ---
 title: "F.A.Q. - How to use map"
 description: "Frequently asked questions for Organic Maps application"
-weight: 1000
 
 taxonomies:
   faq: ["Map"]
 
 extra:
   question: What does gray circle around my position mean?
+  order: 70
 ---
 
 <img src="/images/faq/faq-map-grey-circle.jpg" width="400px"/>
diff --git a/content/faq/map-blue-arrow.md b/content/faq/map-08-blue-arrow.md
similarity index 97%
rename from content/faq/map-blue-arrow.md
rename to content/faq/map-08-blue-arrow.md
index 995ea060..2cd532ac 100644
--- a/content/faq/map-blue-arrow.md
+++ b/content/faq/map-08-blue-arrow.md
@@ -1,13 +1,13 @@
 ---
 title: "F.A.Q. - How to use map"
 description: "Frequently asked questions for Organic Maps application"
-weight: 1000
 
 taxonomies:
   faq: ["Map"]
 
 extra:
   question: What is the purpose of little blue arrow?
+  order: 80
 ---
 
 <img src="/images/faq/faq-map-blue-arrow.jpg" width="400px"/>
diff --git a/content/faq/map-location-button.md b/content/faq/map-09-location-button.md
similarity index 98%
rename from content/faq/map-location-button.md
rename to content/faq/map-09-location-button.md
index b5ab3acb..9efc7f23 100644
--- a/content/faq/map-location-button.md
+++ b/content/faq/map-09-location-button.md
@@ -1,13 +1,13 @@
 ---
 title: "F.A.Q. - How to use map"
 description: "Frequently asked questions for Organic Maps application"
-weight: 1000
 
 taxonomies:
   faq: ["Map"]
 
 extra:
   question: What does icon bellow zoom buttons mean?
+  order: 90
 ---
 
 | Icon | Meaning |
diff --git a/content/faq/map-gps.md b/content/faq/map-10-gps.md
similarity index 95%
rename from content/faq/map-gps.md
rename to content/faq/map-10-gps.md
index 4ea1b764..d5d2eb9d 100644
--- a/content/faq/map-gps.md
+++ b/content/faq/map-10-gps.md
@@ -1,13 +1,13 @@
 ---
 title: "F.A.Q. - How to use map"
 description: "Frequently asked questions for Organic Maps application"
-weight: 1000
 
 taxonomies:
   faq: ["Map"]
 
 extra:
   question: How to catch GPS signal from satelites? How to tell if device got precise or rough position?
+  order: 100
 ---
 
 ???
diff --git a/content/faq/map-position-circle.md b/content/faq/map-11-position-circle.md
similarity index 96%
rename from content/faq/map-position-circle.md
rename to content/faq/map-11-position-circle.md
index 95b600d5..dfc19e19 100644
--- a/content/faq/map-position-circle.md
+++ b/content/faq/map-11-position-circle.md
@@ -1,13 +1,13 @@
 ---
 title: "F.A.Q. - How to use map"
 description: "Frequently asked questions for Organic Maps application"
-weight: 1000
 
 taxonomies:
   faq: ["Map"]
 
 extra:
   question: Why do I see blue circle instead of an arrow indicating my position?
+  order: 110
 ---
 
 Tablets don't have compass sensor that's why circle is drawn instead of directed arrow.
diff --git a/content/faq/map-latest.md b/content/faq/map-12-latest.md
similarity index 97%
rename from content/faq/map-latest.md
rename to content/faq/map-12-latest.md
index 91f0ae72..d2758245 100644
--- a/content/faq/map-latest.md
+++ b/content/faq/map-12-latest.md
@@ -1,13 +1,13 @@
 ---
 title: "F.A.Q. - How to use map"
 description: "Frequently asked questions for Organic Maps application"
-weight: 1000
 
 taxonomies:
   faq: ["Map"]
 
 extra:
   question: How to make sure I have latest application installed and up-to-date maps?
+  order: 120
 ---
 
 First make sure you installed updated app from [AppStore][appstore], [Google Play][googleplay], [FDroid][fdroid], or [Huawei AppGallery][appgallery]. If maps data is outdated you will see red dot. Please download latest maps from menu.
diff --git a/content/faq/map-download-error.md b/content/faq/map-13-download-error.md
similarity index 94%
rename from content/faq/map-download-error.md
rename to content/faq/map-13-download-error.md
index 16dad4c3..97bd7f70 100644
--- a/content/faq/map-download-error.md
+++ b/content/faq/map-13-download-error.md
@@ -1,13 +1,13 @@
 ---
 title: "F.A.Q. - How to use map"
 description: "Frequently asked questions for Organic Maps application"
-weight: 1000
 
 taxonomies:
   faq: ["Map"]
 
 extra:
   question: How to deal with maps download errors?
+  order: 130
 ---
 
 ???
diff --git a/content/faq/map-edits.md b/content/faq/map-14-edits.md
similarity index 98%
rename from content/faq/map-edits.md
rename to content/faq/map-14-edits.md
index 6e39a6ab..7e6ae61a 100644
--- a/content/faq/map-edits.md
+++ b/content/faq/map-14-edits.md
@@ -1,13 +1,13 @@
 ---
 title: "F.A.Q. - How to use map"
 description: "Frequently asked questions for Organic Maps application"
-weight: 1000
 
 taxonomies:
   faq: ["Map"]
 
 extra:
   question: How to make changes to the map?
+  order: 140
 ---
 
 <img src="/images/faq/faq-map-edit-button.jpg" width="400px"/>
diff --git a/content/faq/map-edits-upload.md b/content/faq/map-15-edits-upload.md
similarity index 97%
rename from content/faq/map-edits-upload.md
rename to content/faq/map-15-edits-upload.md
index f3616cce..9bca9d01 100644
--- a/content/faq/map-edits-upload.md
+++ b/content/faq/map-15-edits-upload.md
@@ -1,13 +1,13 @@
 ---
 title: "F.A.Q. - How to use map"
 description: "Frequently asked questions for Organic Maps application"
-weight: 1000
 
 taxonomies:
   faq: ["Map"]
 
 extra:
   question: How edits are uploaded on OpenStreetMaps.org, how conflicts are resolved?
+  order: 150
 ---
 
 OrganicMaps application stores POI changes locally till internet connection is available.
diff --git a/content/faq/map-edits-moderation.md b/content/faq/map-16-edits-moderation.md
similarity index 93%
rename from content/faq/map-edits-moderation.md
rename to content/faq/map-16-edits-moderation.md
index 9901efd0..3081db83 100644
--- a/content/faq/map-edits-moderation.md
+++ b/content/faq/map-16-edits-moderation.md
@@ -1,13 +1,13 @@
 ---
 title: "F.A.Q. - How to use map"
 description: "Frequently asked questions for Organic Maps application"
-weight: 1000
 
 taxonomies:
   faq: ["Map"]
 
 extra:
   question: Who moderates changes?
+  order: 160
 ---
 
 ???
diff --git a/content/faq/map-edit-disabled.md b/content/faq/map-17-edit-disabled.md
similarity index 96%
rename from content/faq/map-edit-disabled.md
rename to content/faq/map-17-edit-disabled.md
index 4752514a..4911f2a2 100644
--- a/content/faq/map-edit-disabled.md
+++ b/content/faq/map-17-edit-disabled.md
@@ -1,13 +1,13 @@
 ---
 title: "F.A.Q. - How to use map"
 description: "Frequently asked questions for Organic Maps application"
-weight: 1000
 
 taxonomies:
   faq: ["Map"]
 
 extra:
   question: Why "Edit place" button is disabled or hidden?
+  order: 170
 ---
 
 If your maps data is more than 2 month then edit button is unavailable.
diff --git a/content/faq/map-search.md b/content/faq/map-18-search.md
similarity index 97%
rename from content/faq/map-search.md
rename to content/faq/map-18-search.md
index b5dfe86c..3de82884 100644
--- a/content/faq/map-search.md
+++ b/content/faq/map-18-search.md
@@ -1,13 +1,13 @@
 ---
 title: "F.A.Q. - How to use map"
 description: "Frequently asked questions for Organic Maps application"
-weight: 1000
 
 taxonomies:
   faq: ["Map"]
 
 extra:
   question: How to use search?
+  order: 180
 ---
 
 You can search places, addresses, cities, sites and many other interrests. OrganicMaps looks not only by name but by type. You can find nearest drinking water, bycicle parking, bookstore or cave from search field.
diff --git a/content/faq/map-search-secret.md b/content/faq/map-19-search-secret.md
similarity index 97%
rename from content/faq/map-search-secret.md
rename to content/faq/map-19-search-secret.md
index 40e9ab4e..6d9f61bd 100644
--- a/content/faq/map-search-secret.md
+++ b/content/faq/map-19-search-secret.md
@@ -1,13 +1,13 @@
 ---
 title: "F.A.Q. - How to use map"
 description: "Frequently asked questions for Organic Maps application"
-weight: 1000
 
 taxonomies:
   faq: ["Map"]
 
 extra:
   question: What are secret search queries?
+  order: 190
 ---
 
 `?vulkan`, `?gl` - ???
diff --git a/content/faq/routing-build.md b/content/faq/routing-01-build.md
similarity index 97%
rename from content/faq/routing-build.md
rename to content/faq/routing-01-build.md
index a5a50728..23186663 100644
--- a/content/faq/routing-build.md
+++ b/content/faq/routing-01-build.md
@@ -1,13 +1,13 @@
 ---
 title: "F.A.Q. - Routing"
 description: "Frequently asked questions for Organic Maps application"
-weight: 1000
 
 taxonomies:
   faq: ["Routing"]
 
 extra:
   question: How to build a route?
+  order: 10
 ---
 
 OrganicMaps can build a route for car trip, bycicle ride or foot walk.
diff --git a/content/faq/routing-intermediate.md b/content/faq/routing-02-intermediate.md
similarity index 97%
rename from content/faq/routing-intermediate.md
rename to content/faq/routing-02-intermediate.md
index a9d7c4ab..a45df282 100644
--- a/content/faq/routing-intermediate.md
+++ b/content/faq/routing-02-intermediate.md
@@ -1,13 +1,13 @@
 ---
 title: "F.A.Q. - Routing"
 description: "Frequently asked questions for Organic Maps application"
-weight: 1000
 
 taxonomies:
   faq: ["Routing"]
 
 extra:
   question: How to add intermediate route points?
+  order: 20
 ---
 
 In route planning or routing mode pick a point on map and tap "Add Stop" button. New intermediate point would be added to the route.
diff --git a/content/faq/routing-compare.md b/content/faq/routing-03-compare.md
similarity index 95%
rename from content/faq/routing-compare.md
rename to content/faq/routing-03-compare.md
index f005a299..d086871c 100644
--- a/content/faq/routing-compare.md
+++ b/content/faq/routing-03-compare.md
@@ -1,13 +1,13 @@
 ---
 title: "F.A.Q. - Routing"
 description: "Frequently asked questions for Organic Maps application"
-weight: 1000
 
 taxonomies:
   faq: ["Routing"]
 
 extra:
   question: Почему маршруты в ОМ честные и отличаются от других приложений?
+  order: 30
 ---
 
 ???
diff --git a/content/faq/routing-bad-route.md b/content/faq/routing-04-bad-route.md
similarity index 96%
rename from content/faq/routing-bad-route.md
rename to content/faq/routing-04-bad-route.md
index 8fe5960b..dd1eb123 100644
--- a/content/faq/routing-bad-route.md
+++ b/content/faq/routing-04-bad-route.md
@@ -1,13 +1,13 @@
 ---
 title: "F.A.Q. - Routing"
 description: "Frequently asked questions for Organic Maps application"
-weight: 1000
 
 taxonomies:
   faq: ["Routing"]
 
 extra:
   question: Why OrganicMaps builds crooked route?
+  order: 40
 ---
 
 This could happen if map is outdated. We work on routing constantly. Please update the app regularly.
diff --git a/content/faq/routing-avoidance.md b/content/faq/routing-05-avoidance.md
similarity index 97%
rename from content/faq/routing-avoidance.md
rename to content/faq/routing-05-avoidance.md
index 35b9960e..d086b125 100644
--- a/content/faq/routing-avoidance.md
+++ b/content/faq/routing-05-avoidance.md
@@ -1,13 +1,13 @@
 ---
 title: "F.A.Q. - Routing"
 description: "Frequently asked questions for Organic Maps application"
-weight: 1000
 
 taxonomies:
   faq: ["Routing"]
 
 extra:
   question: How to enable route aviodance rules?
+  order: 50
 ---
 
 Go to Settings → Routing options and select types of road you want to avoid:
diff --git a/content/faq/routing-intermediate-2.md b/content/faq/routing-06-intermediate-2.md
similarity index 95%
rename from content/faq/routing-intermediate-2.md
rename to content/faq/routing-06-intermediate-2.md
index 18f9f247..2b4d36ef 100644
--- a/content/faq/routing-intermediate-2.md
+++ b/content/faq/routing-06-intermediate-2.md
@@ -1,13 +1,13 @@
 ---
 title: "F.A.Q. - Routing"
 description: "Frequently asked questions for Organic Maps application"
-weight: 1000
 
 taxonomies:
   faq: ["Routing"]
 
 extra:
   question: Добавить промежуточные точки для обхода/объезда (как?)
+  order: 60
 ---
 
 ???
diff --git a/content/faq/routing-ruler.md b/content/faq/routing-07-ruler.md
similarity index 97%
rename from content/faq/routing-ruler.md
rename to content/faq/routing-07-ruler.md
index c0ff5ef4..f813d872 100644
--- a/content/faq/routing-ruler.md
+++ b/content/faq/routing-07-ruler.md
@@ -1,13 +1,13 @@
 ---
 title: "F.A.Q. - Routing"
 description: "Frequently asked questions for Organic Maps application"
-weight: 1000
 
 taxonomies:
   faq: ["Routing"]
 
 extra:
   question: How to measure distance with OrganicMaps? Is there a ruler?
+  order: 70
 ---
 
 To measure distance from your current position to some object pick that object on map, tap "Route to" button, and select Ruler route type:
diff --git a/content/faq/routing-north-up.md b/content/faq/routing-08-north-up.md
similarity index 96%
rename from content/faq/routing-north-up.md
rename to content/faq/routing-08-north-up.md
index 782c7476..366f9956 100644
--- a/content/faq/routing-north-up.md
+++ b/content/faq/routing-08-north-up.md
@@ -1,13 +1,13 @@
 ---
 title: "F.A.Q. - Routing"
 description: "Frequently asked questions for Organic Maps application"
-weight: 1000
 
 taxonomies:
   faq: ["Routing"]
 
 extra:
   question: How to enable north up in navigation mode?
+  order: 80
 ---
 
 <img src="/images/faq/faq-map-location-icon-4.png" width="75px"/>
diff --git a/content/faq/routing-rotations.md b/content/faq/routing-09-rotations.md
similarity index 97%
rename from content/faq/routing-rotations.md
rename to content/faq/routing-09-rotations.md
index b872f469..afb14976 100644
--- a/content/faq/routing-rotations.md
+++ b/content/faq/routing-09-rotations.md
@@ -1,13 +1,13 @@
 ---
 title: "F.A.Q. - Routing"
 description: "Frequently asked questions for Organic Maps application"
-weight: 1000
 
 taxonomies:
   faq: ["Routing"]
 
 extra:
   question: Why map rotates around my position?
+  order: 90
 ---
 
 The reason could be magnet on your phone case or radiation source near the phone. It could interfere compass sensor.
diff --git a/content/faq/routing-wrong-direction.md b/content/faq/routing-10-wrong-direction.md
similarity index 96%
rename from content/faq/routing-wrong-direction.md
rename to content/faq/routing-10-wrong-direction.md
index 505f9276..e81fbccb 100644
--- a/content/faq/routing-wrong-direction.md
+++ b/content/faq/routing-10-wrong-direction.md
@@ -1,13 +1,13 @@
 ---
 title: "F.A.Q. - Routing"
 description: "Frequently asked questions for Organic Maps application"
-weight: 1000
 
 taxonomies:
   faq: ["Routing"]
 
 extra:
   question: Location arrow points to wrong direction. How to fix?
+  order: 100
 ---
 
 Probably you have problem with compass sensor.
diff --git a/content/faq/tts.md b/content/faq/tts.md
index 95b163ba..ea7e26b7 100644
--- a/content/faq/tts.md
+++ b/content/faq/tts.md
@@ -1,13 +1,13 @@
 ---
 title: Text-to-Speech on Android
 description: Guide on how to make TTS work on Android
-weight: 100
 
 taxonomies:
   faq: ["TTS"]
 
 extra:
-    question: How to setup voice instructions?
+  question: How to setup voice instructions?
+  order: 10
 ---
 
 ## Summary
diff --git a/templates/faq/single.html b/templates/faq/single.html
index 26c9ae88..e0c56d75 100644
--- a/templates/faq/single.html
+++ b/templates/faq/single.html
@@ -6,7 +6,7 @@
 
 {% block content %}
   <h1>F.A.Q. - {{ term.name }}</h1>
-  {%- for faq_page in term.pages -%} {# How to sort questions #}
+  {%- for faq_page in term.pages | sort(attribute="extra.order") -%}
   <h3>{{ faq_page.extra | get(key="question", default="[No extra.question provided]") }}</h3>
   {{ faq_page.content | safe }}
   {%- endfor -%}