Enter uriEncode()

Unconditional URI-encoding in RequestContext::get_query<F>(F)
2025-12-29 09:28:02 -05:00 · 2023-01-25 23:45:18 +04:00 · 2023-01-25 23:41:52 +04:00
147 changed files with 2188 additions and 6767 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -7,41 +7,42 @@ on:
  pull_request:

 jobs:
-  macOS:
-    runs-on: macos-13
-    env:
-      HOME: /Users/runner
+  Macos:
+    runs-on: macos-latest
    steps:
-      - name: Retrieve source code
-        uses: actions/checkout@v3
-
+      - name: Checkout code
+        uses: actions/checkout@v2
+      - name: Setup python 3.9
+        uses: actions/setup-python@v1
+        with:
+          python-version: '3.9'
      - name: Install packages
        run: |
          brew update
-          brew unlink python3
-          # upgrade from python@3.11.2_1 to python@3.11.3 fails to overwrite those
-          rm -f /usr/local/bin/2to3 /usr/local/bin/2to3-3.11 /usr/local/bin/idle3 /usr/local/bin/idle3.11 /usr/local/bin/pydoc3 /usr/local/bin/pydoc3.11 /usr/local/bin/python3 /usr/local/bin/python3-config /usr/local/bin/python3.11 /usr/local/bin/python3.11-config
-          brew install pkg-config ninja meson
-
-      - name: Install dependencies
-        env:
-          ARCHIVE_NAME: deps2_macos_native_dyn_libkiwix.tar.xz
+          brew install gcovr pkg-config ninja || brew link --overwrite python
+      - name: Install python modules
+        run: pip3 install meson==0.49.2 pytest
+      - name: Install deps
+        shell: bash
        run: |
-          wget -O- https://tmp.kiwix.org/ci/${{env.ARCHIVE_NAME}} | tar -xJ -C ${{env.HOME}}
-
-      - name: Compile source code
-        env:
-          PKG_CONFIG_PATH: ${{env.HOME}}/BUILD_native_dyn/INSTALL/lib/pkgconfig
-          CPPFLAGS: -I${{env.HOME}}/BUILD_native_dyn/INSTALL/include
+          ARCHIVE_NAME=deps2_osx_native_dyn_libkiwix.tar.xz
+          wget -O- http://tmp.kiwix.org/ci/${ARCHIVE_NAME} | tar -xJ -C $HOME
+      - name: Compile
+        shell: bash
        run: |
+          export PKG_CONFIG_PATH=$HOME/BUILD_native_dyn/INSTALL/lib/pkgconfig
+          export CPPFLAGS="-I$HOME/BUILD_native_dyn/INSTALL/include"
          meson . build --default-library=shared -Db_coverage=true
-          ninja -C build
-
-      - name: Test libkiwix
+          cd build
+          ninja
+      - name: Test
+        shell: bash
+        run: |
+          export LD_LIBRARY_PATH=$HOME/BUILD_native_dyn/INSTALL/lib:$HOME/BUILD_native_dyn/INSTALL/lib64
+          cd build
+          meson test --verbose
        env:
          SKIP_BIG_MEMORY_TEST: 1
-          LD_LIBRARY_PATH: ${{env.HOME}}/BUILD_native_dyn/INSTALL/lib:${{env.HOME}}/BUILD_native_dyn/INSTALL/lib64
-        run: meson test -C build --verbose

  Linux:
    strategy:
@@ -57,19 +58,19 @@ jobs:
        include:
          - name: native_static
            target: native_static
-            image_variant: focal
+            image_variant: bionic
            lib_postfix: '/x86_64-linux-gnu'
          - name: native_dyn
            target: native_dyn
-            image_variant: focal
+            image_variant: bionic
            lib_postfix: '/x86_64-linux-gnu'
          - name: android_arm
            target: android_arm
-            image_variant: focal
+            image_variant: bionic
            lib_postfix: '/arm-linux-androideabi'
          - name: android_arm64
            target: android_arm64
-            image_variant: focal
+            image_variant: bionic
            lib_postfix: '/aarch64-linux-android'
          - name: win32_static
            target: win32_static
@@ -81,12 +82,22 @@ jobs:
            lib_postfix: '64'
    env:
      HOME: /home/runner
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
    container:
-      image: "ghcr.io/kiwix/kiwix-build_ci_${{matrix.image_variant}}:38"
+      image: "kiwix/kiwix-build_ci:${{matrix.image_variant}}-31"
    steps:
    - name: Checkout code
-      uses: actions/checkout@v3
+      shell: python
+      run: |
+        from subprocess import check_call
+        from os import environ
+        command = [
+          'git', 'clone',
+          'https://github.com/${{github.repository}}',
+          '--depth=1',
+          '--branch', '${{ github.head_ref || github.ref_name }}'
+        ]
+        check_call(command, cwd=environ['HOME'])
    - name: Install deps
      shell: bash
      run: |
@@ -109,6 +120,7 @@ jobs:
        if [[ "${{matrix.target}}" =~ android_.* ]]; then
          MESON_OPTION="$MESON_OPTION -Dstatic-linkage=true"
        fi
+        cd $HOME/libkiwix
        meson . build ${MESON_OPTION}
        cd build
        ninja
@@ -119,15 +131,19 @@ jobs:
      if: startsWith(matrix.target, 'native_')
      shell: bash
      run: |
-        cd build
+        cd $HOME/libkiwix/build
        meson test --verbose
        ninja coverage
      env:
        LD_LIBRARY_PATH: "/home/runner/BUILD_${{matrix.target}}/INSTALL/lib:/home/runner/BUILD_${{matrix.target}}/INSTALL/lib${{matrix.lib_postfix}}"
        SKIP_BIG_MEMORY_TEST: 1
-
    - name: Publish coverage
+      shell: bash
+      run: |
+        cd $HOME/libkiwix
+        curl https://codecov.io/bash -o codecov.sh
+        bash codecov.sh -n "${OS_NAME}_${{matrix.target}}" -Z
+        rm codecov.sh
      if: startsWith(matrix.target, 'native_')
-      uses: codecov/codecov-action@v3
-      with:
-        token: ${{ secrets.CODECOV_TOKEN }}
+      env:
+        CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
--- a/.github/workflows/package.yml
+++ b/.github/workflows/package.yml
@@ -1,25 +1,19 @@
 name: Packages
-
-on:
-  pull_request:
-  push:
-    branches:
-      - main
-  release:
-    types: [published]
+on: [push, pull_request]

 jobs:
  build-deb:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
    strategy:
      fail-fast: false
      matrix:
        distro:
-          - debian-unstable
+          - ubuntu-kinetic
          - ubuntu-jammy
          - ubuntu-focal
+          - ubuntu-bionic
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2

      # Determine which PPA we should upload to
      - name: PPA
@@ -40,12 +34,13 @@ jobs:
          email: release+launchpad@kiwix.org
          distro: ${{ matrix.distro }}

-      - uses: legoktm/gh-action-build-deb@debian-unstable
-        if: matrix.distro == 'debian-unstable'
-        name: Build package for debian-unstable
-        id: build-debian-unstable
+      - uses: legoktm/gh-action-build-deb@ubuntu-kinetic
+        if: matrix.distro == 'ubuntu-kinetic'
+        name: Build package for ubuntu-kinetic
+        id: build-ubuntu-kinetic
        with:
          args: --no-sign
+          ppa: ${{ steps.ppa.outputs.ppa }}

      - uses: legoktm/gh-action-build-deb@ubuntu-jammy
        if: matrix.distro == 'ubuntu-jammy'
@@ -63,14 +58,22 @@ jobs:
          args: --no-sign
          ppa: ${{ steps.ppa.outputs.ppa }}

-      - uses: actions/upload-artifact@v3
+      - uses: legoktm/gh-action-build-deb@ubuntu-bionic
+        if: matrix.distro == 'ubuntu-bionic'
+        name: Build package for ubuntu-bionic
+        id: build-ubuntu-bionic
+        with:
+          args: --no-sign
+          ppa: ${{ steps.ppa.outputs.ppa }}
+
+      - uses: actions/upload-artifact@v2
        with:
          name: Packages for ${{ matrix.distro }}
          path: output

      - uses: legoktm/gh-action-dput@master
        name: Upload dev package
-        # Only upload on pushes to main
+        # Only upload on pushes to git default branch
        if: github.event_name == 'push' && github.event.ref == 'refs/heads/main' && startswith(matrix.distro, 'ubuntu-')
        with:
          gpg_key: ${{ secrets.LAUNCHPAD_GPG }}
@@ -79,8 +82,10 @@ jobs:

      - uses: legoktm/gh-action-dput@master
        name: Upload release package
-        if: github.event_name == 'release' && startswith(matrix.distro, 'ubuntu-')
+        # Only upload on pushes to master or tag
+        if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags') && startswith(matrix.distro, 'ubuntu-')
        with:
          gpg_key: ${{ secrets.LAUNCHPAD_GPG }}
          repository: ppa:kiwixteam/release
          packages: output/*_source.changes
+
--- a/.readthedocs.yaml
+++ b/.readthedocs.yaml
@@ -1,21 +0,0 @@
-# Read the Docs configuration file
-# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
-
-# Required
-version: 2
-
-# Set the version of Python and other tools you might need
-build:
-  os: ubuntu-22.04
-  tools:
-    python: "3.11"
-
-# Build documentation in the docs/ directory with Sphinx
-sphinx:
-  configuration: docs/conf.py
-
-# We recommend specifying your dependencies to enable reproducible builds:
-# https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html
-python:
-  install:
-  - requirements: docs/requirements.txt
--- a/57
+++ b/57
@@ -1,60 +1,3 @@
-libkiwix 13.0.0
-===============
-
- * Server:
-  - Improved look & feel of kiwix-serve UI (@veloman-yunkan #917 #1021)
-  - Increase tolerance to malformed (control characters) ZIM entry titles (@veloman-yunkan #1023)
-  - API allowing to filter many categories at once (@juuz0 #974)
-  - Cookie-less user language control (@veloman-yumkan #997)
-  - Hack to fix Mirrorbrain based broken magnet URLs (@rgaudin #1001)
- * Fix handling of books with 'Name' metadata with dots (@mgautier #1016)
- * New method beautifyFileSize() to provide nice-looking book sizes (@vuuz0 #971)
- * Fix a few missing includes (@mgautierfr #978)
- * New functions to read - kiwix-serve - languages and categories streams (@juuz0 #967)
- * Add support of Fon language (@kelson42 #1013)
- * C++17 code base compliancy (@mgautierfr #996)
- * Use everywhere std::shared_ptr in place of raw pointer (@mgautierfr #991)
- * Do not use [[nodiscard]] attribute on compiler not supporting it (@mgautierfr #1003)
- * Add a non minified version of autoComplete.js (@mgautierfr #1008)
- * Multiple CI/CD improvements (@kelson42 #982)
-
-libkiwix 12.1.0
-===============
-
- * Server:
-  - Introduce a `/nojs` endpoint to browse catalog and zim files with a browser without js (@juuz0 #897)
-  - Translate the viewer (@veloman-yunkan #871 #846)
-  - Display `mul` on tile when zim is multi-languages (@juuz0 #934)
-  - Suggestion links point to the `/content` endpoint (@veloman-yunkan #862)
-  - Correctly compress web fonts in http answers (@kelson42 #856)
-  - Correctly encode link in suggestions (@veloman-yunkan #859 #860 #963)
-  - Correctly encode url redirection (@veloman-yunkan #866 #890)
-  - Properly handle user language, through cookies and http headers (@veloman-yunkan #849 #869)
-  - Fix url encoding (@veloman-yunkan #870)
-  - Fix viewer for viewer for SeaMonkey (@veloman-yunkan #887)
-  - Make the downloader threadsafe (@mgautierfr #886)
-  - Add RSS feed in the main page (pointing to the catalog) (@juuz0 #882 #920)
-  - Correctly set the mimetype for json and ico (@veloman-yunkan #892)
-  - `count=-1` correspond to unlimited count (instead of 0) (@veloman-yunkan #894)
-  - Keep the navigation bar on top (@juuz0 #896)
-  - Make the viewer's iframe "safe" (@veloman-yunkan #906 #930)
-  - Correctly escape search link in XML Opds output (@veloman-yunkan #936)
-  - Store values needed for the viewer js in the url fragment instead of the query string (@juuz0 #907)
-  - Get rid of legacy OPDS API usage in the viewer (@veloman-yunkan #939)
-  - Fix charset encoding declaration in OPDS response MIME types (@veloman-yunkan #942)
-  - Fix PDF in the viewer (@veloman-yunkan #940)
-  - Fix external links handling in the viewer (@veloman-yunkan #959)
-  - Add tests of searching with accents (@mgautierfs #954)
- * Fix handling of missing illustration in the book (@veloman-yunkan #961)
- * Add support for multi languages zim files (@veloman-yunkan #904)
- * Fix includes for openbsd (@bentley #949)
- * Fix pathes in git to allow git clone on Windows (@adamlamar #868)
- * Switch to `main` as principal branch (instead of `master`) (@kelson42)
- * Remove libkiwix android publisher from the repository (@kelson42 #884)
- * Various fixes of meson and CI. (@mgautierfr @kelson42)
-
-
-
 libkiwix 12.0.0
 ===============

--- a/README.md
+++ b/README.md
@@ -24,9 +24,9 @@ with the Libkiwix compilation itself, we recommend to have a look to
 Preamble
 --------

-Although the Libkiwix can be (cross-)compiled on/for many systems, the
+Although the Libkiwix can be (cross-)compiled on/for many sytems, the
 following documentation explains how to do it on POSIX ones. It is
-primarily thought for GNU/Linux systems and has been tested on recent
+primarly thought for GNU/Linux systems and has been tested on recent
 releases of Ubuntu and Fedora.

 Dependencies
@@ -54,7 +54,7 @@ The following dependency needs to be available at runtime:
 These dependencies may or may not be packaged by your operating
 system. They may also be packaged but only in an older version. The
 compilation script will tell you if one of them is missing or too old.
-In the worst case, you will have to download and compile bleeding edge
+In the worse case, you will have to download and compile bleeding edge
 version by hand.

 If you want to install these dependencies locally, then use the
@@ -190,7 +190,7 @@ To use JS provided by kiwix-serve you can use the following template to start wi
 - To get books listed using `index.js` add - `<div class="book__list"></div>` under body tag.
 - To get number of books listed add - `<h3 class="kiwixHomeBody__results"></h3>` under body tag.
 - To add language select box add - `<select id="languageFilter"></select>` under body tag.
- To add category select box add - `<select id="categoryFilter"></select>` under body tag.
+- To add language select box add - `<select id="categoryFilter"></select>` under body tag.
 - To add search box for books use following form -
    ```
        <form id='kiwixSearchForm'>
@@ -201,7 +201,7 @@ To use JS provided by kiwix-serve you can use the following template to start wi


 If you compile manually Libmicrohttpd, you might need to compile it
-without GNU TLS, a bug here will impeach further compilation
+without GNU TLS, a bug here will empeach further compilation
 otherwise.

 If the compilation still fails, you might need to get a more recent
--- a/android-kiwix-lib-publisher/.gitignore
+++ b/android-kiwix-lib-publisher/.gitignore
@@ -0,0 +1,13 @@
+*.iml
+.gradle
+/local.properties
+/.idea/caches
+/.idea/libraries
+/.idea/modules.xml
+/.idea/workspace.xml
+/.idea/navEditor.xml
+/.idea/assetWizardSettings.xml
+.DS_Store
+/build
+/captures
+.externalNativeBuild
--- a/android-kiwix-lib-publisher/build.gradle
+++ b/android-kiwix-lib-publisher/build.gradle
@@ -0,0 +1,25 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+    repositories {
+        google()
+        jcenter()
+
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:3.4.1'
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
+    }
+}
+
+allprojects {
+    repositories {
+        google()
+        jcenter()
+    }
+}
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}
--- a/android-kiwix-lib-publisher/gradle.properties
+++ b/android-kiwix-lib-publisher/gradle.properties
@@ -0,0 +1,15 @@
+# Project-wide Gradle settings.
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+org.gradle.jvmargs=-Xmx1536m
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+# Kotlin code style for this project: "official" or "obsolete":
+kotlin.code.style=official
--- a/android-kiwix-lib-publisher/gradle/wrapper/gradle-wrapper.jar
+++ b/android-kiwix-lib-publisher/gradle/wrapper/gradle-wrapper.jar
--- a/android-kiwix-lib-publisher/gradle/wrapper/gradle-wrapper.properties
+++ b/android-kiwix-lib-publisher/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Wed Jun 19 15:28:39 BST 2019
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
--- a/android-kiwix-lib-publisher/gradlew
+++ b/android-kiwix-lib-publisher/gradlew
@@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"
--- a/android-kiwix-lib-publisher/gradlew.bat
+++ b/android-kiwix-lib-publisher/gradlew.bat
@@ -0,0 +1,84 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
--- a/android-kiwix-lib-publisher/kiwixLibAndroid/.gitignore
+++ b/android-kiwix-lib-publisher/kiwixLibAndroid/.gitignore
@@ -0,0 +1 @@
+/build
--- a/android-kiwix-lib-publisher/kiwixLibAndroid/build.gradle
+++ b/android-kiwix-lib-publisher/kiwixLibAndroid/build.gradle
@@ -0,0 +1,64 @@
+apply plugin: 'com.android.library'
+apply plugin: 'maven'
+
+android {
+    compileSdkVersion 28
+    defaultConfig {
+        minSdkVersion 15
+        targetSdkVersion 28
+        versionCode 1
+        versionName "1.0"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    implementation 'com.getkeepsafe.relinker:relinker:1.3.1'
+}
+
+task writePom {
+  pom {
+    project {
+        groupId 'org.kiwix.kiwixlib'
+        artifactId 'kiwixlib'
+        version '10.1.1' + (System.env.KIWIXLIB_BUILDVERSION == null ? '' : '-'+System.env.KIWIXLIB_BUILDVERSION)
+        packaging 'aar'
+        name 'kiwixlib'
+        url 'https://github.com/kiwix/libkiwix'
+        licenses {
+            license {
+                name 'GPLv3'
+                url 'https://www.gnu.org/licenses/gpl-3.0.en.html'
+            }
+        }
+      developers {
+          developer {
+              id 'kiwix'
+              name 'kiwix'
+              email 'contact@kiwix.org'
+          }
+      }
+      scm {
+          connection 'https://github.com/kiwix/libkiwix.git'
+          developerConnection 'https://github.com/kiwix/libkiwix.git'
+          url 'https://github.com/kiwix/libkiwix'
+      }
+    }
+  }.withXml {
+    def dependenciesNode = asNode().appendNode('dependencies')
+
+    //Iterate over the implementation dependencies, adding a <dependency> node for each
+    configurations.implementation.allDependencies.each {
+      def dependencyNode = dependenciesNode.appendNode('dependency')
+      dependencyNode.appendNode('groupId', it.group)
+      dependencyNode.appendNode('artifactId', it.name)
+      dependencyNode.appendNode('version', it.version)
+    }
+  }.writeTo("$buildDir/pom.xml")
+}
+
--- a/android-kiwix-lib-publisher/kiwixLibAndroid/proguard-rules.pro
+++ b/android-kiwix-lib-publisher/kiwixLibAndroid/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
--- a/android-kiwix-lib-publisher/kiwixLibAndroid/src/main/AndroidManifest.xml
+++ b/android-kiwix-lib-publisher/kiwixLibAndroid/src/main/AndroidManifest.xml
@@ -0,0 +1,10 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.kiwix.kiwixlib">
+
+    <application
+        android:allowBackup="true"
+        android:supportsRtl="true">
+
+    </application>
+
+</manifest>
--- a/android-kiwix-lib-publisher/settings.gradle
+++ b/android-kiwix-lib-publisher/settings.gradle
@@ -0,0 +1 @@
+include ':kiwixLibAndroid'
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -24,6 +24,8 @@ author = 'libkiwix-team'

 # -- General configuration ---------------------------------------------------

+on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
+
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
@@ -40,7 +42,9 @@ templates_path = ['_templates']
 # This pattern also affects html_static_path and html_extra_path.
 exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']

-html_theme = 'sphinx_rtd_theme'
+
+if not on_rtd:
+    html_theme = 'sphinx_rtd_theme'

 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,3 +1,2 @@
 breathe
 exhale
-sphinx_rtd_theme
--- a/include/book.h
+++ b/include/book.h
@@ -79,9 +79,7 @@ class Book
  bool isPathValid() const { return m_pathValid; }
  const std::string& getTitle() const { return m_title; }
  const std::string& getDescription() const { return m_description; }
-  DEPRECATED const std::string& getLanguage() const { return m_language; }
-  const std::string& getCommaSeparatedLanguages() const { return m_language; }
-  const std::vector<std::string> getLanguages() const;
+  const std::string& getLanguage() const { return m_language; }
  const std::string& getCreator() const { return m_creator; }
  const std::string& getPublisher() const { return m_publisher; }
  const std::string& getDate() const { return m_date; }
--- a/include/downloader.h
+++ b/include/downloader.h
@@ -25,7 +25,6 @@
 #include <map>
 #include <memory>
 #include <stdexcept>
-#include <mutex>

 namespace kiwix
 {
@@ -44,14 +43,6 @@ class AriaError : public std::runtime_error {
 };


-/**
- * A representation of a current download.
- *
- * `Download` is not thread safe. User must care to not call method on a
- * same download from different threads.
- * However, it is safe to use different `Download`s from different threads.
- */
-
 class Download {
 public:
  typedef enum { K_ACTIVE, K_WAITING, K_PAUSED, K_ERROR, K_COMPLETE, K_REMOVED, K_UNKNOWN } StatusResult;
@@ -62,89 +53,19 @@ class Download {
    : mp_aria(p_aria),
      m_status(K_UNKNOWN),
      m_did(did) {};
-
-  /**
-   * Update the status of the download.
-   *
-   * This call make an aria rpc call and is blocking.
-   * Some download (started with a metalink) are in fact several downloads.
-   * - A first one to download the metadlink.
-   * - A second one to download the real file.
-   *
-   * If `follow` is true, updateStatus tries to detect that and tracks
-   * the second download when the first one is finished.
-   * By passing false to `follow`, `Download` will only track the first download.
-   *
-   * `getFoo` methods are based on the last statusUpdate.
-   *
-   * @param follow: Do we have to follow following downloads.
-   */
-  void updateStatus(bool follow);
-
-  /**
-   * Pause the download (and call updateStatus)
-   */
+  void updateStatus(bool follow=false);
  void pauseDownload();
-
-  /**
-   * Resume the download (and call updateStatus)
-   */
  void resumeDownload();
-
-  /**
-   * Cancel the download.
-   *
-   * A canceled downlod cannot be resume and updateStatus does nothing.
-   * However, you can still get information based on the last known information.
-   */
  void cancelDownload();
-
-  /*
-   * Get the status of the download.
-   */
-  StatusResult getStatus() const             { return m_status; }
-
-  /*
-   * Get the id of the download.
-   */
-  const std::string&  getDid() const         { return m_did; }
-
-  /*
-   * Get the id of the "second" download.
-   *
-   * Set only if the "first" download is a metalink and is complete.
-   */
-  const std::string&  getFollowedBy() const  { return m_followedBy; }
-
-  /*
-   * Get the total length of the download.
-   */
-  uint64_t     getTotalLength() const        { return m_totalLength; }
-
-  /*
-   * Get the completed length of the download.
-   */
-  uint64_t     getCompletedLength() const    { return m_completedLength; }
-
-  /*
-   * Get the download speed of the download.
-   */
-  uint64_t     getDownloadSpeed() const      { return m_downloadSpeed; }
-
-  /*
-   * Get the verified length of the download.
-   */
-  uint64_t     getVerifiedLength() const     { return m_verifiedLength; }
-
-  /*
-   * Get the path (local file) of the download.
-   */
-  const std::string&  getPath() const        { return m_path; }
-
-  /*
-   * Get the download uris of the download.
-   */
-  const std::vector<std::string>&  getUris() const { return m_uris; }
+  StatusResult getStatus()          { return m_status; }
+  std::string  getDid()             { return m_did; }
+  std::string  getFollowedBy()      { return m_followedBy; }
+  uint64_t     getTotalLength()     { return m_totalLength; }
+  uint64_t     getCompletedLength() { return m_completedLength; }
+  uint64_t     getDownloadSpeed()   { return m_downloadSpeed; }
+  uint64_t     getVerifiedLength()  { return m_verifiedLength; }
+  std::string  getPath()            { return m_path; }
+  std::vector<std::string>&  getUris()             { return m_uris; }

 protected:
  std::shared_ptr<Aria2> mp_aria;
@@ -162,9 +83,6 @@ class Download {
 /**
 * A tool to download things.
 *
- * A Downloader manages `Download` using aria2 in the background.
- * `Downloader` is threadsafe.
- * However, the returned `Download`s are NOT threadsafe.
 */
 class Downloader
 {
@@ -174,41 +92,14 @@ class Downloader

  void close();

-  /**
-   * Start a new download.
-   *
-   * This method is thread safe and return a pointer to a newly created `Download`.
-   * User should call `update` on the returned `Download` to have an accurate status.
-   *
-   * @param uri: The uri of the thing to download.
-   * @param options: A series of pair <option_name, option_value> to pass to aria.
-   * @return: The newly created Download.
-   */
-  std::shared_ptr<Download> startDownload(const std::string& uri, const std::vector<std::pair<std::string, std::string>>& options = {});
+  Download* startDownload(const std::string& uri, const std::vector<std::pair<std::string, std::string>>& options = {});
+  Download* getDownload(const std::string& did);

-  /**
-   * Get a download corrsponding to a download id (did)
-   * User should call `update` on the returned `Download` to have an accurate status.
-   *
-   * @param did: The download id to search for.
-   * @return: The Download corresponding to did.
-   * @throw: Throw std::out_of_range if did is not found.
-   */
-  std::shared_ptr<Download> getDownload(const std::string& did);
-
-  /**
-   * Get the number of downloads currently managed.
-   */
-  size_t getNbDownload() const;
-
-  /**
-   * Get the ids of the managed downloads.
-   */
-  std::vector<std::string> getDownloadIds() const;
+  size_t getNbDownload() { return m_knownDownloads.size(); }
+  std::vector<std::string> getDownloadIds();

 private:
-  mutable std::mutex m_lock;
-  std::map<std::string, std::shared_ptr<Download>> m_knownDownloads;
+  std::map<std::string, std::unique_ptr<Download>> m_knownDownloads;
  std::shared_ptr<Aria2> mp_aria;
 };
 }
--- a/include/library.h
+++ b/include/library.h
@@ -34,10 +34,6 @@

 #define KIWIX_LIBRARY_VERSION "20110515"

-namespace Xapian {
-class WritableDatabase;
-};
-
 namespace kiwix
 {

@@ -109,12 +105,6 @@ class Filter {
    Filter& acceptTags(const Tags& tags);
    Filter& rejectTags(const Tags& tags);

-    /**
-     *  Set the filter to only accept books in the specified category.
-     *
-     *  Multiple categories can be specified as a comma-separated list (in
-     *  which case a book in any of those categories will match).
-     */
    Filter& category(std::string category);

    /**
@@ -130,8 +120,6 @@ class Filter {
    Filter& maxSize(size_t size);
    Filter& query(std::string query, bool partial=true);
    Filter& name(std::string name);
-    Filter& clearLang();
-    Filter& clearCategory();

    bool hasQuery() const;
    const std::string& getQuery() const { return _query; }
@@ -177,53 +165,31 @@ class ZimSearcher : public zim::Searcher
    std::mutex m_mutex;
 };

-template<typename, typename>
-class ConcurrentCache;
-
-template<typename, typename>
-class MultiKeyCache;
-
-using LibraryPtr = std::shared_ptr<Library>;
-using ConstLibraryPtr = std::shared_ptr<const Library>;
-
-
-// Some compiler we use don't have [[nodiscard]] attribute.
-// We don't want to declare `create` with it in this case.
-#define LIBKIWIX_NODISCARD
-#if defined __has_cpp_attribute
-  #if __has_cpp_attribute (nodiscard)
-    #undef LIBKIWIX_NODISCARD
-    #define LIBKIWIX_NODISCARD [[nodiscard]]
-  #endif
-#endif
-
 /**
 * A Library store several books.
 */
-class Library: public std::enable_shared_from_this<Library>
+class Library
 {
+  // all data fields must be added in LibraryBase
+  mutable std::mutex m_mutex;
+
 public:
  typedef uint64_t Revision;
  typedef std::vector<std::string> BookIdCollection;
  typedef std::map<std::string, int> AttributeCounts;
  typedef std::set<std::string> BookIdSet;

- private:
-  Library();
-
 public:
-  LIBKIWIX_NODISCARD static LibraryPtr create() {
-    return LibraryPtr(new Library());
-  }
+  Library();
  ~Library();

  /**
   * Library is not a copiable object. However it can be moved.
   */
  Library(const Library& ) = delete;
-  Library(Library&& ) = delete;
+  Library(Library&& );
  void operator=(const Library& ) = delete;
-  Library& operator=(Library&& ) = delete;
+  Library& operator=(Library&& );

  /**
   * Add a book to the library.
@@ -394,36 +360,19 @@ class Library: public std::enable_shared_from_this<Library>

 private: // types
  typedef const std::string& (Book::*BookStrPropMemFn)() const;
-  struct Entry : Book
-  {
-    Library::Revision lastUpdatedRevision = 0;
-  };
+  struct Impl;

 private: // functions
  AttributeCounts getBookAttributeCounts(BookStrPropMemFn p) const;
  std::vector<std::string> getBookPropValueSet(BookStrPropMemFn p) const;
  BookIdCollection filterViaBookDB(const Filter& filter) const;
-  unsigned int getBookCount_not_protected(const bool localBooks, const bool remoteBooks) const;
  void updateBookDB(const Book& book);
  void dropCache(const std::string& bookId);

 private: //data
-  mutable std::mutex m_mutex;
-  Library::Revision m_revision;
-  std::map<std::string, Entry> m_books;
-  using ArchiveCache = ConcurrentCache<std::string, std::shared_ptr<zim::Archive>>;
-  std::unique_ptr<ArchiveCache> mp_archiveCache;
-  using SearcherCache = MultiKeyCache<std::string, std::shared_ptr<ZimSearcher>>;
-  std::unique_ptr<SearcherCache> mp_searcherCache;
-  std::vector<kiwix::Bookmark> m_bookmarks;
-  std::unique_ptr<Xapian::WritableDatabase> m_bookDB;
+  std::unique_ptr<Impl> mp_impl;
 };

-// We don't need it anymore and we don't want to polute any other potential usage
-// of `LIBKIWIX_NODISCARD` token.
-#undef LIBKIWIX_NODISCARD
-
-
 }

 #endif
--- a/include/libxml_dumper.h
+++ b/include/libxml_dumper.h
--- a/include/manager.h
+++ b/include/manager.h
@@ -37,10 +37,10 @@ namespace kiwix
 class LibraryManipulator
 {
 public: // functions
-  explicit LibraryManipulator(LibraryPtr library);
+  explicit LibraryManipulator(Library* library);
  virtual ~LibraryManipulator();

-  LibraryPtr getLibrary() const { return library; }
+  Library& getLibrary() const { return library; }

  bool addBookToLibrary(const Book& book);
  void addBookmarkToLibrary(const Bookmark& bookmark);
@@ -52,7 +52,7 @@ class LibraryManipulator
  virtual void booksWereRemovedFromLibrary();

 private: // data
-  LibraryPtr library;
+  kiwix::Library& library;
 };

 /**
@@ -64,8 +64,8 @@ class Manager
  typedef std::vector<std::string> Paths;

 public: // functions
-  explicit Manager(LibraryManipulator manipulator);
-  explicit Manager(LibraryPtr library);
+  explicit Manager(LibraryManipulator* manipulator);
+  explicit Manager(Library* library);

  /**
   * Read a `library.xml` and add book in the file to the library.
@@ -163,7 +163,7 @@ class Manager
  uint64_t m_itemsPerPage = 0;

 protected:
-  kiwix::LibraryManipulator manipulator;
+  std::shared_ptr<kiwix::LibraryManipulator> manipulator;

  bool readBookFromPath(const std::string& path, Book* book);
  bool parseXmlDom(const pugi::xml_document& doc,
--- a/include/meson.build
+++ b/include/meson.build
@@ -4,6 +4,8 @@ headers = [
  'common.h',
  'library.h',
  'manager.h',
+  'libxml_dumper.h',
+  'opds_dumper.h',
  'downloader.h',
  'search_renderer.h',
  'server.h',
--- a/include/name_mapper.h
+++ b/include/name_mapper.h
@@ -59,7 +59,7 @@ class HumanReadableNameMapper : public NameMapper {
 class UpdatableNameMapper : public NameMapper {
    typedef std::shared_ptr<NameMapper> NameMapperHandle;
  public:
-    UpdatableNameMapper(std::shared_ptr<Library> library, bool withAlias);
+    UpdatableNameMapper(Library& library, bool withAlias);

    virtual std::string getNameForId(const std::string& id) const;
    virtual std::string getIdForName(const std::string& name) const;
@@ -71,7 +71,7 @@ class UpdatableNameMapper : public NameMapper {

  private:
    mutable std::mutex mutex;
-    std::shared_ptr<Library> library;
+    Library& library;
    NameMapperHandle nameMapper;
    const bool withAlias;
 };
--- a/include/opds_dumper.h
+++ b/include/opds_dumper.h
@@ -28,7 +28,6 @@

 #include "library.h"
 #include "name_mapper.h"
-#include "library_dumper.h"

 using namespace std;

@@ -39,10 +38,11 @@ namespace kiwix
 * A tool to dump a `Library` into a opds stream.
 *
 */
-class OPDSDumper : public LibraryDumper
+class OPDSDumper
 {
 public:
-  OPDSDumper(const Library* library, const NameMapper* NameMapper);
+  OPDSDumper() = default;
+  OPDSDumper(Library* library, NameMapper* NameMapper);
  ~OPDSDumper();

  /**
@@ -85,6 +85,38 @@ class OPDSDumper : public LibraryDumper
   * @return The OPDS feed.
   */
  std::string languagesOPDSFeed() const;
+
+  /**
+   * Set the id of the library.
+   *
+   * @param id the id to use.
+   */
+  void setLibraryId(const std::string& id) { this->libraryId = id;}
+
+  /**
+   * Set the root location used when generating url.
+   *
+   * @param rootLocation the root location to use.
+   */
+  void setRootLocation(const std::string& rootLocation) { this->rootLocation = rootLocation; }
+
+  /**
+   * Set some informations about the search results.
+   *
+   * @param totalResult the total number of results of the search.
+   * @param startIndex the start index of the result.
+   * @param count the number of result of the current set (or page).
+   */
+  void setOpenSearchInfo(int totalResult, int startIndex, int count);
+
+ protected:
+  kiwix::Library* library;
+  kiwix::NameMapper* nameMapper;
+  std::string libraryId;
+  std::string rootLocation;
+  int m_totalResults;
+  int m_startIndex;
+  int m_count;
 };
 }

--- a/include/search_renderer.h
+++ b/include/search_renderer.h
@@ -37,11 +37,29 @@ class SearchRenderer
  /**
   * Construct a SearchRenderer from a SearchResultSet.
   *
+   * The constructed version of the SearchRenderer will not introduce
+   * the book name for each result. It is better to use the other constructor
+   * with a Library pointer to have a better html page.
+   *
   * @param srs The `SearchResultSet` to render.
+   * @param mapper The `NameMapper` to use to do the rendering.
   * @param start The start offset used for the srs.
   * @param estimatedResultCount The estimatedResultCount of the whole search
   */
-  SearchRenderer(zim::SearchResultSet srs, unsigned int start, unsigned int estimatedResultCount);
+  SearchRenderer(zim::SearchResultSet srs, NameMapper* mapper,
+                 unsigned int start, unsigned int estimatedResultCount);
+
+  /**
+   * Construct a SearchRenderer from a SearchResultSet.
+   *
+   * @param srs The `SearchResultSet` to render.
+   * @param mapper The `NameMapper` to use to do the rendering.
+   * @param library The `Library` to use to look up book details for search results.
+   * @param start The start offset used for the srs.
+   * @param estimatedResultCount The estimatedResultCount of the whole search
+   */
+  SearchRenderer(zim::SearchResultSet srs, NameMapper* mapper, Library* library,
+                 unsigned int start, unsigned int estimatedResultCount);

  ~SearchRenderer();

@@ -72,32 +90,24 @@ class SearchRenderer
    this->pageLength  = pageLength;
  }

+  std::string renderTemplate(const std::string& tmpl_str);
+
  /**
   * Generate the html page with the resutls of the search.
-   *
-   * @param mapper The `NameMapper` to use to do the rendering.
-   * @param library The `Library` to use to look up book details for search results.
-                    May be nullptr. In this case, bookName is not set in the rendered string.
-   * @return The html string
   */
-  std::string getHtml(const NameMapper& mapper, const Library* library);
+  std::string getHtml();

-  /**
+    /**
   * Generate the xml page with the resutls of the search.
-   *
-   * @param mapper The `NameMapper` to use to do the rendering.
-   * @param library The `Library` to use to look up book details for search results.
-                    May be nullptr. In this case, bookName is not set in the rendered string.
-   * @return The xml string
   */
-  std::string getXml(const NameMapper& mapper, const Library* library);
+  std::string getXml();

- protected: // function
-  std::string renderTemplate(const std::string& tmpl_str, const NameMapper& mapper, const Library *library);

 protected:
  std::string beautifyInteger(const unsigned int number);
  zim::SearchResultSet m_srs;
+  NameMapper* mp_nameMapper;
+  Library* mp_library;
  std::string searchBookQuery;
  std::string searchPattern;
  std::string protocolPrefix;
--- a/include/server.h
+++ b/include/server.h
@@ -36,7 +36,7 @@ namespace kiwix
        *
        * @param library The library to serve.
        */
-       Server(std::shared_ptr<Library> library, std::shared_ptr<NameMapper> nameMapper=nullptr);
+       Server(Library* library, NameMapper* nameMapper=nullptr);

       virtual ~Server();

@@ -66,8 +66,8 @@ namespace kiwix
       std::string getAddress();

     protected:
-       std::shared_ptr<Library> mp_library;
-       std::shared_ptr<NameMapper> mp_nameMapper;
+       Library* mp_library;
+       NameMapper* mp_nameMapper;
       std::string m_root = "";
       std::string m_addr = "";
       std::string m_indexTemplateString = "";
--- a/include/tools.h
+++ b/include/tools.h
@@ -23,12 +23,8 @@
 #include <string>
 #include <vector>
 #include <map>
-#include <cstdint>

 namespace kiwix {
-typedef std::pair<std::string, std::string> LangNameCodePair;
-typedef std::vector<LangNameCodePair> FeedLanguages;
-typedef std::vector<std::string> FeedCategories;

 /**
 * Return the current directory.
@@ -220,37 +216,5 @@ std::map<std::string, std::string> getNetworkInterfaces();
 */
 std::string getBestPublicIp();

-/** Converts file size to human readable format.
- *
- * This function will convert a number to its equivalent size using units.
- *
- * @param number file size in bytes.
- * @return a human-readable string representation of the size, e.g., "2.3 KB", "1.8 MB", "5.2 GB".
- */
-std::string beautifyFileSize(uint64_t number);
-
-/**
- * Load languages stored in an OPDS stream.
- * 
- * @param content the OPDS stream.
- * @return vector containing pairs of language code and their corresponding full language name. 
- */
-FeedLanguages readLanguagesFromFeed(const std::string& content);
-
-/**
- * Load categories stored in an OPDS stream .
- * 
- * @param content the OPDS stream.
- * @return vector containing category strings.
- */
-FeedCategories readCategoriesFromFeed(const std::string& content);
-
-/**
- * Retrieve the full language name associated with a given ISO 639-3 language code.
- * 
- * @param lang ISO 639-3 language code.
- * @return full language name.
- */
-std::string getLanguageSelfName(const std::string& lang);
 }
 #endif // KIWIX_TOOLS_H
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,7 @@
 project('libkiwix', 'cpp',
-  version : '13.0.0',
+  version : '12.0.0',
  license : 'GPLv3+',
-  default_options : ['c_std=c11', 'cpp_std=c++17', 'werror=true'])
+  default_options : ['c_std=c11', 'cpp_std=c++11', 'werror=true'])

 compiler = meson.get_compiler('cpp')

@@ -36,7 +36,7 @@ else
 endif

 libzim_dep = dependency('libzim', version : '>=8.1.0', static:static_deps)
-if not compiler.has_header_symbol('zim/zim.h', 'LIBZIM_WITH_XAPIAN', dependencies: libzim_dep)
+if not compiler.has_header_symbol('zim/zim.h', 'LIBZIM_WITH_XAPIAN')
  error('Libzim seems to be compiled without xapian. Xapian support is mandatory.')
 endif

--- a/scripts/kiwix-compile-resources
+++ b/scripts/kiwix-compile-resources
@@ -202,17 +202,15 @@ if __name__ == "__main__":
    parser.add_argument('--source_dir',
                        help="Additional directory where to look for resources.",
                        action='append')
-    parser.add_argument('resource_files', nargs='+',
+    parser.add_argument('resource_file',
                        help='The list of resources to compile.')
    args = parser.parse_args()

+    base_dir = os.path.dirname(os.path.realpath(args.resource_file))
    source_dir = args.source_dir or []
-    resources = []
-    for resfile in args.resource_files:
-        base_dir = os.path.dirname(os.path.realpath(resfile))
-        with open(resfile, 'r') as f:
-            resources += [Resource([base_dir]+source_dir, *line.strip().split())
-                            for line in f.readlines()]
+    with open(args.resource_file, 'r') as f:
+        resources = [Resource([base_dir]+source_dir, *line.strip().split())
+                        for line in f.readlines()]

    h_identifier = to_identifier(os.path.basename(args.hfile))
    with open(args.hfile, 'w') as f:
--- a/scripts/kiwix-compile-resources.1
+++ b/scripts/kiwix-compile-resources.1
@@ -2,7 +2,7 @@
 .SH NAME
 kiwix-compile-resources \- helper to compile and generate some Kiwix resources
 .SH SYNOPSIS
-\fBkiwix\-compile\-resources\fR [\-h] [\-\-cxxfile CXXFILE] [\-\-hfile HFILE] resource_file ...\fR
+\fBkiwix\-compile\-resources\fR [\-h] [\-\-cxxfile CXXFILE] [\-\-hfile HFILE] resource_file\fR
 .SH DESCRIPTION
 .TP
 resource_file
--- a/src/aria2.cpp
+++ b/src/aria2.cpp
@@ -24,7 +24,7 @@
 #define LOG_ARIA_ERROR() \
  { \
    std::cerr << "ERROR: aria2 RPC request failed. (" << res << ")." << std::endl; \
-    std::cerr << (curlErrorBuffer[0] ? curlErrorBuffer : curl_easy_strerror(res)) << std::endl; \
+    std::cerr << (m_curlErrorBuffer[0] ? m_curlErrorBuffer.get() : curl_easy_strerror(res)) << std::endl; \
  }

 namespace kiwix {
@@ -32,7 +32,9 @@ namespace kiwix {
 Aria2::Aria2():
  mp_aria(nullptr),
  m_port(42042),
-  m_secret(getNewRpcSecret())
+  m_secret(getNewRpcSecret()),
+  m_curlErrorBuffer(new char[CURL_ERROR_SIZE]),
+  mp_curl(nullptr)
 {
  m_downloadDir = getDataDirectory();
  makeDirectory(m_downloadDir);
@@ -89,32 +91,36 @@ Aria2::Aria2():
      launchCmd.append(cmd).append(" ");
  }
  mp_aria = Subprocess::run(callCmd);
+  mp_curl = curl_easy_init();

-  CURL* p_curl = curl_easy_init();
-  char curlErrorBuffer[CURL_ERROR_SIZE];
-
-  curl_easy_setopt(p_curl, CURLOPT_URL, "http://localhost/rpc");
-  curl_easy_setopt(p_curl, CURLOPT_PORT, m_port);
-  curl_easy_setopt(p_curl, CURLOPT_POST, 1L);
-  curl_easy_setopt(p_curl, CURLOPT_ERRORBUFFER, curlErrorBuffer);
+  curl_easy_setopt(mp_curl, CURLOPT_URL, "http://localhost/rpc");
+  curl_easy_setopt(mp_curl, CURLOPT_PORT, m_port);
+  curl_easy_setopt(mp_curl, CURLOPT_POST, 1L);
+  curl_easy_setopt(mp_curl, CURLOPT_ERRORBUFFER, m_curlErrorBuffer.get());

  int watchdog = 50;
  while(--watchdog) {
    sleep(10);
-    curlErrorBuffer[0] = 0;
-    auto res = curl_easy_perform(p_curl);
+    m_curlErrorBuffer[0] = 0;
+    auto res = curl_easy_perform(mp_curl);
    if (res == CURLE_OK) {
      break;
    } else if (watchdog == 1) {
      LOG_ARIA_ERROR();
    }
  }
-  curl_easy_cleanup(p_curl);
  if (!watchdog) {
+    curl_easy_cleanup(mp_curl);
    throw std::runtime_error("Cannot connect to aria2c rpc. Aria2c launch cmd : " + launchCmd);
  }
 }

+Aria2::~Aria2()
+{
+  std::unique_lock<std::mutex> lock(m_lock);
+  curl_easy_cleanup(mp_curl);
+}
+
 void Aria2::close()
 {
  saveSession();
@@ -134,25 +140,20 @@ std::string Aria2::doRequest(const MethodCall& methodCall)
  std::stringstream outStream;
  CURLcode res;
  long response_code;
-  char curlErrorBuffer[CURL_ERROR_SIZE];
-  CURL* p_curl = curl_easy_init();
-  curl_easy_setopt(p_curl, CURLOPT_URL, "http://localhost/rpc");
-  curl_easy_setopt(p_curl, CURLOPT_PORT, m_port);
-  curl_easy_setopt(p_curl, CURLOPT_POST, 1L);
-  curl_easy_setopt(p_curl, CURLOPT_ERRORBUFFER, curlErrorBuffer);
-  curl_easy_setopt(p_curl, CURLOPT_POSTFIELDSIZE, requestContent.size());
-  curl_easy_setopt(p_curl, CURLOPT_POSTFIELDS, requestContent.c_str());
-  curl_easy_setopt(p_curl, CURLOPT_WRITEFUNCTION, &write_callback_to_iss);
-  curl_easy_setopt(p_curl, CURLOPT_WRITEDATA, &outStream);
-  curlErrorBuffer[0] = 0;
-  res = curl_easy_perform(p_curl);
-  if (res != CURLE_OK) {
-    LOG_ARIA_ERROR();
-    curl_easy_cleanup(p_curl);
-    throw std::runtime_error("Cannot perform request");
+  {
+    std::unique_lock<std::mutex> lock(m_lock);
+    curl_easy_setopt(mp_curl, CURLOPT_POSTFIELDSIZE, requestContent.size());
+    curl_easy_setopt(mp_curl, CURLOPT_POSTFIELDS, requestContent.c_str());
+    curl_easy_setopt(mp_curl, CURLOPT_WRITEFUNCTION, &write_callback_to_iss);
+    curl_easy_setopt(mp_curl, CURLOPT_WRITEDATA, &outStream);
+    m_curlErrorBuffer[0] = 0;
+    res = curl_easy_perform(mp_curl);
+    if (res != CURLE_OK) {
+      LOG_ARIA_ERROR();
+      throw std::runtime_error("Cannot perform request");
+    }
+    curl_easy_getinfo(mp_curl, CURLINFO_RESPONSE_CODE, &response_code);
  }
-  curl_easy_getinfo(p_curl, CURLINFO_RESPONSE_CODE, &response_code);
-  curl_easy_cleanup(p_curl);

  auto responseContent = outStream.str();
  if (response_code != 200) {
--- a/src/aria2.h
+++ b/src/aria2.h
@@ -12,6 +12,7 @@
 #include "xmlrpc.h"

 #include <memory>
+#include <mutex>
 #include <curl/curl.h>

 namespace kiwix {
@@ -23,11 +24,15 @@ class Aria2
    int m_port;
    std::string m_secret;
    std::string m_downloadDir;
+    std::unique_ptr<char[]> m_curlErrorBuffer;
+    CURL* mp_curl;
+    std::mutex m_lock;
+
    std::string doRequest(const MethodCall& methodCall);

  public:
    Aria2();
-    virtual ~Aria2() = default;
+    virtual ~Aria2();
    void close();

    std::string addUri(const std::vector<std::string>& uri, const std::vector<std::pair<std::string, std::string>>& options = {});
--- a/src/book.cpp
+++ b/src/book.cpp
@@ -117,12 +117,11 @@ void Book::updateFromXml(const pugi::xml_node& node, const std::string& baseDir)
  m_articleCount = strtoull(ATTR("articleCount"), 0, 0);
  m_mediaCount = strtoull(ATTR("mediaCount"), 0, 0);
  m_size = strtoull(ATTR("size"), 0, 0) << 10;
-  const std::string faviconMimeType = ATTR("faviconMimeType");
-  const std::string faviconBase64EncodedData = ATTR("favicon");
-  if ( !faviconMimeType.empty() && !faviconBase64EncodedData.empty() ) {
+  std::string favicon_mimetype = ATTR("faviconMimeType");
+  if (! favicon_mimetype.empty()) {
    const auto favicon = std::make_shared<Illustration>();
-    favicon->data = base64_decode(faviconBase64EncodedData);
-    favicon->mimeType = faviconMimeType;
+    favicon->data = base64_decode(ATTR("favicon"));
+    favicon->mimeType = favicon_mimetype;
    favicon->url = ATTR("faviconUrl");
    m_illustrations.assign(1, favicon);
  }
@@ -287,9 +286,4 @@ std::string Book::getCategoryFromTags() const
  }
 }

-const std::vector<std::string> Book::getLanguages() const
-{
-  return kiwix::split(m_language, ",");
-}
-
 }
--- a/src/downloader.cpp
+++ b/src/downloader.cpp
@@ -127,24 +127,22 @@ void Download::cancelDownload()
 Downloader::Downloader() :
  mp_aria(new Aria2())
 {
-  try {
-    for (auto gid : mp_aria->tellWaiting()) {
-      m_knownDownloads[gid] = std::unique_ptr<Download>(new Download(mp_aria, gid));
-      m_knownDownloads[gid]->updateStatus(false);
-    }
-  } catch (std::exception& e) {
-    std::cerr << "aria2 tellWaiting failed : " << e.what() << std::endl;
-  }
  try {
    for (auto gid : mp_aria->tellActive()) {
-      if( m_knownDownloads.find(gid) == m_knownDownloads.end()) {
-        m_knownDownloads[gid] = std::unique_ptr<Download>(new Download(mp_aria, gid));
-        m_knownDownloads[gid]->updateStatus(false);
-      }
+      m_knownDownloads[gid] = std::unique_ptr<Download>(new Download(mp_aria, gid));
+      m_knownDownloads[gid]->updateStatus();
    }
  } catch (std::exception& e) {
    std::cerr << "aria2 tellActive failed : " << e.what() << std::endl;
  }
+  try {
+    for (auto gid : mp_aria->tellWaiting()) {
+      m_knownDownloads[gid] = std::unique_ptr<Download>(new Download(mp_aria, gid));
+      m_knownDownloads[gid]->updateStatus();
+    }
+  } catch (std::exception& e) {
+    std::cerr << "aria2 tellWaiting failed : " << e.what() << std::endl;
+  }
 }

 /* Destructor */
@@ -157,8 +155,7 @@ void Downloader::close()
  mp_aria->close();
 }

-std::vector<std::string> Downloader::getDownloadIds() const {
-  std::unique_lock<std::mutex> lock(m_lock);
+std::vector<std::string> Downloader::getDownloadIds() {
  std::vector<std::string> ret;
  for(auto& p:m_knownDownloads) {
    ret.push_back(p.first);
@@ -166,46 +163,42 @@ std::vector<std::string> Downloader::getDownloadIds() const {
  return ret;
 }

-std::shared_ptr<Download> Downloader::startDownload(const std::string& uri, const std::vector<std::pair<std::string, std::string>>& options)
+Download* Downloader::startDownload(const std::string& uri, const std::vector<std::pair<std::string, std::string>>& options)
 {
-  std::unique_lock<std::mutex> lock(m_lock);
  for (auto& p: m_knownDownloads) {
    auto& d = p.second;
    auto& uris = d->getUris();
    if (std::find(uris.begin(), uris.end(), uri) != uris.end())
-      return d;
+      return d.get();
  }
  std::vector<std::string> uris = {uri};
  auto gid = mp_aria->addUri(uris, options);
-  m_knownDownloads[gid] = std::make_shared<Download>(mp_aria, gid);
-  return m_knownDownloads[gid];
+  m_knownDownloads[gid] = std::unique_ptr<Download>(new Download(mp_aria, gid));
+  return m_knownDownloads[gid].get();
 }

-std::shared_ptr<Download> Downloader::getDownload(const std::string& did)
+Download* Downloader::getDownload(const std::string& did)
 {
-  std::unique_lock<std::mutex> lock(m_lock);
  try {
-    return m_knownDownloads.at(did);
+    m_knownDownloads.at(did).get()->updateStatus(true);
+    return m_knownDownloads.at(did).get();
  } catch(std::exception& e) {
-    for (auto gid : mp_aria->tellWaiting()) {
-      if (gid == did) {
-        m_knownDownloads[gid] = std::make_shared<Download>(mp_aria, gid);
-        return m_knownDownloads[gid];
-      }
-    }
    for (auto gid : mp_aria->tellActive()) {
      if (gid == did) {
-        m_knownDownloads[gid] = std::make_shared<Download>(mp_aria, gid);
-        return m_knownDownloads[gid];
+        m_knownDownloads[gid] = std::unique_ptr<Download>(new Download(mp_aria, gid));
+        m_knownDownloads.at(gid).get()->updateStatus(true);
+        return m_knownDownloads[gid].get();
      }
    }
+    for (auto gid : mp_aria->tellWaiting()) {
+      if (gid == did) {
+        m_knownDownloads[gid] = std::unique_ptr<Download>(new Download(mp_aria, gid));
+        m_knownDownloads.at(gid).get()->updateStatus(true);
+        return m_knownDownloads[gid].get();
+      }
+  }
    throw e;
  }
 }

-size_t Downloader::getNbDownload() const {
-  std::unique_lock<std::mutex> lock(m_lock);
-  return m_knownDownloads.size();
-}
-
 }
--- a/src/html_dumper.cpp
+++ b/src/html_dumper.cpp
@@ -1,120 +0,0 @@
-#include "html_dumper.h"
-#include "libkiwix-resources.h"
-#include "tools/otherTools.h"
-#include "tools.h"
-#include "tools/regexTools.h"
-#include "server/i18n.h"
-
-namespace kiwix
-{
-
-/* Constructor */
-HTMLDumper::HTMLDumper(const Library* library, const NameMapper* nameMapper)
-  : LibraryDumper(library, nameMapper)
-{
-}
-/* Destructor */
-HTMLDumper::~HTMLDumper()
-{
-}
-
-namespace {
-
-std::string humanFriendlyTitle(std::string title)
-{
-  std::string humanFriendlyString = replaceRegex(title, "_", " ");
-  humanFriendlyString[0] = toupper(humanFriendlyString[0]);
-  return humanFriendlyString;
-}
-
-kainjow::mustache::list getTagList(std::string tags)
-{
-  const auto tagsList = kiwix::split(tags, ";", true, false);
-  kainjow::mustache::list finalTagList;
-  for (auto tag : tagsList) {
-  if (tag[0] != '_')
-    finalTagList.push_back(kainjow::mustache::object{
-      {"tag", tag}
-    });
-  }
-  return finalTagList;
-}
-
-} // unnamed namespace
-
-std::string HTMLDumper::dumpPlainHTML(kiwix::Filter filter) const
-{
-  kainjow::mustache::list booksData;
-  const auto filteredBooks = library->filter(filter);
-  const auto searchQuery = filter.getQuery();
-  auto languages = getLanguageData();
-  auto categories = getCategoryData();
-
-  for (auto &category : categories) {
-    const auto categoryName = category.get("name")->string_value();
-    if (categoryName == filter.getCategory()) {
-      category["selected"] = true;
-    }
-    category["hf_name"] = humanFriendlyTitle(categoryName);
-  }
-
-  for (auto &language : languages) {
-    if (language.get("lang_code")->string_value() == filter.getLang()) {
-      language["selected"] = true;
-    }
-  }
-
-  for ( const auto& bookId : filteredBooks ) {
-    const auto bookObj = library->getBookById(bookId);
-    const auto bookTitle = bookObj.getTitle();
-    std::string contentId = "";
-    try {
-      contentId = urlEncode(nameMapper->getNameForId(bookId));
-    } catch (...) {}
-    const auto bookDescription = bookObj.getDescription();
-    const auto langCode = bookObj.getCommaSeparatedLanguages();
-    const auto bookIconUrl = rootLocation + "/catalog/v2/illustration/" + bookId +  "/?size=48";
-    const auto tags = bookObj.getTags();
-    const auto downloadAvailable = (bookObj.getUrl() != "");
-    std::string faviconAttr = "style=background-image:url(" + bookIconUrl + ")";
-    
-    booksData.push_back(kainjow::mustache::object{
-      {"id", contentId},
-      {"title", bookTitle},
-      {"description", bookDescription},
-      {"langCode", langCode},
-      {"faviconAttr", faviconAttr},
-      {"tagList", getTagList(tags)},
-      {"downloadAvailable", downloadAvailable}
-    });
-  }
-
-  auto getTranslation = i18n::GetTranslatedStringWithMsgId(m_userLang);
-
-  const auto translations = kainjow::mustache::object{
-                    getTranslation("search"),
-                    getTranslation("download"),
-                    getTranslation("count-of-matching-books", {{"COUNT", to_string(filteredBooks.size())}}),
-                    getTranslation("book-filtering-all-categories"),
-                    getTranslation("book-filtering-all-languages"),
-                    getTranslation("powered-by-kiwix-html"),
-                    getTranslation("welcome-to-kiwix-server"),
-                    getTranslation("preview-book"),
-                    getTranslation("welcome-page-overzealous-filter", {{"URL", "?lang="}})
-  };
-
-  return render_template(
-             RESOURCE::templates::no_js_library_page_html,
-             kainjow::mustache::object{
-               {"root", rootLocation},
-               {"books", booksData },
-               {"searchQuery", searchQuery},
-               {"languages", languages},
-               {"categories", categories},
-               {"noResults", filteredBooks.size() == 0},
-               {"translations", translations}
-             }
-  );
-}
-
-} // namespace kiwix
--- a/src/html_dumper.h
+++ b/src/html_dumper.h
@@ -1,50 +0,0 @@
-/*
- * Copyright 2023 Nikhil Tanwar <2002nikhiltanwar@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU  General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#ifndef KIWIX_HTML_DUMPER_H
-#define KIWIX_HTML_DUMPER_H
-
-#include <string>
-
-#include "library_dumper.h"
-
-namespace kiwix
-{
-
-/**
- * A class to dump Library in HTML format.
- */
-class HTMLDumper : public LibraryDumper
-{
- public:
-  HTMLDumper(const Library* library, const NameMapper* NameMapper);
-  ~HTMLDumper();
-
-
-  /**
-   * Dump library in HTML
-   *
-   * @return HTML content
-   */
-  std::string dumpPlainHTML(kiwix::Filter filter) const;
-};
-
-}
-
-#endif // KIWIX_HTML_DUMPER_H
--- a/src/library.cpp
+++ b/src/library.cpp
@@ -39,8 +39,6 @@
 namespace kiwix
 {

-
-
 namespace
 {

@@ -60,8 +58,6 @@ bool booksReferToTheSameArchive(const Book& book1, const Book& book2)
      && book1.getPath() == book2.getPath();
 }

-} // unnamed namespace
-
 template<typename Key, typename Value>
 class MultiKeyCache: public ConcurrentCache<std::set<Key>, Value>
 {
@@ -83,8 +79,49 @@ class MultiKeyCache: public ConcurrentCache<std::set<Key>, Value>
    }
 };

+} // unnamed namespace
+
+struct Library::Impl
+{
+  struct Entry : Book
+  {
+    Library::Revision lastUpdatedRevision = 0;
+  };
+
+  Library::Revision m_revision;
+  std::map<std::string, Entry> m_books;
+  using ArchiveCache = ConcurrentCache<std::string, std::shared_ptr<zim::Archive>>;
+  std::unique_ptr<ArchiveCache> mp_archiveCache;
+  using SearcherCache = MultiKeyCache<std::string, std::shared_ptr<ZimSearcher>>;
+  std::unique_ptr<SearcherCache> mp_searcherCache;
+  std::vector<kiwix::Bookmark> m_bookmarks;
+  Xapian::WritableDatabase m_bookDB;
+
+  unsigned int getBookCount(const bool localBooks, const bool remoteBooks) const;
+
+  Impl();
+  ~Impl();
+
+  Impl(Impl&& );
+  Impl& operator=(Impl&& );
+};
+
+Library::Impl::Impl()
+  : mp_archiveCache(new ArchiveCache(std::max(getEnvVar<int>("KIWIX_ARCHIVE_CACHE_SIZE", 1), 1))),
+    mp_searcherCache(new SearcherCache(std::max(getEnvVar<int>("KIWIX_SEARCHER_CACHE_SIZE", 1), 1))),
+    m_bookDB("", Xapian::DB_BACKEND_INMEMORY)
+{
+}
+
+Library::Impl::~Impl()
+{
+}
+
+Library::Impl::Impl(Library::Impl&& ) = default;
+Library::Impl& Library::Impl::operator=(Library::Impl&& ) = default;
+
 unsigned int
-Library::getBookCount_not_protected(const bool localBooks, const bool remoteBooks) const
+Library::Impl::getBookCount(const bool localBooks, const bool remoteBooks) const
 {
  unsigned int result = 0;
  for (auto& pair: m_books) {
@@ -99,41 +136,50 @@ Library::getBookCount_not_protected(const bool localBooks, const bool remoteBook

 /* Constructor */
 Library::Library()
-  : mp_archiveCache(new ArchiveCache(std::max(getEnvVar<int>("KIWIX_ARCHIVE_CACHE_SIZE", 1), 1))),
-    mp_searcherCache(new SearcherCache(std::max(getEnvVar<int>("KIWIX_SEARCHER_CACHE_SIZE", 1), 1))),
-    m_bookDB(new Xapian::WritableDatabase("", Xapian::DB_BACKEND_INMEMORY))
+  : mp_impl(new Library::Impl)
 {
 }

+Library::Library(Library&& other)
+  : mp_impl(std::move(other.mp_impl))
+{
+}
+
+Library& Library::operator=(Library&& other)
+{
+  mp_impl = std::move(other.mp_impl);
+  return *this;
+}
+
 /* Destructor */
 Library::~Library() = default;

 bool Library::addBook(const Book& book)
 {
  std::lock_guard<std::mutex> lock(m_mutex);
-  ++m_revision;
+  ++mp_impl->m_revision;
  /* Try to find it */
  updateBookDB(book);
  try {
-    auto& oldbook = m_books.at(book.getId());
+    auto& oldbook = mp_impl->m_books.at(book.getId());
    if ( ! booksReferToTheSameArchive(oldbook, book) ) {
      dropCache(book.getId());
    }
    oldbook.update(book); // XXX: This may have no effect if oldbook is readonly
                          // XXX: Then m_bookDB will become out-of-sync with
                          // XXX: the real contents of the library.
-    oldbook.lastUpdatedRevision = m_revision;
+    oldbook.lastUpdatedRevision = mp_impl->m_revision;
    return false;
  } catch (std::out_of_range&) {
-    auto& newEntry = m_books[book.getId()];
+    auto& newEntry = mp_impl->m_books[book.getId()];
    static_cast<Book&>(newEntry) = book;
-    newEntry.lastUpdatedRevision = m_revision;
-    size_t new_cache_size = static_cast<size_t>(std::ceil(getBookCount_not_protected(true, true)*0.1));
+    newEntry.lastUpdatedRevision = mp_impl->m_revision;
+    size_t new_cache_size = static_cast<size_t>(std::ceil(mp_impl->getBookCount(true, true)*0.1));
    if (getEnvVar<int>("KIWIX_ARCHIVE_CACHE_SIZE", -1) <= 0) {
-      mp_archiveCache->setMaxSize(new_cache_size);
+      mp_impl->mp_archiveCache->setMaxSize(new_cache_size);
    }
    if (getEnvVar<int>("KIWIX_SEARCHER_CACHE_SIZE", -1) <= 0) {
-      mp_searcherCache->setMaxSize(new_cache_size);
+      mp_impl->mp_searcherCache->setMaxSize(new_cache_size);
    }
    return true;
  }
@@ -142,15 +188,15 @@ bool Library::addBook(const Book& book)
 void Library::addBookmark(const Bookmark& bookmark)
 {
  std::lock_guard<std::mutex> lock(m_mutex);
-  m_bookmarks.push_back(bookmark);
+  mp_impl->m_bookmarks.push_back(bookmark);
 }

 bool Library::removeBookmark(const std::string& zimId, const std::string& url)
 {
  std::lock_guard<std::mutex> lock(m_mutex);
-  for(auto it=m_bookmarks.begin(); it!=m_bookmarks.end(); it++) {
+  for(auto it=mp_impl->m_bookmarks.begin(); it!=mp_impl->m_bookmarks.end(); it++) {
    if (it->getBookId() == zimId && it->getUrl() == url) {
-      m_bookmarks.erase(it);
+      mp_impl->m_bookmarks.erase(it);
      return true;
    }
  }
@@ -160,14 +206,14 @@ bool Library::removeBookmark(const std::string& zimId, const std::string& url)

 void Library::dropCache(const std::string& id)
 {
-  mp_archiveCache->drop(id);
-  mp_searcherCache->drop(id);
+  mp_impl->mp_archiveCache->drop(id);
+  mp_impl->mp_searcherCache->drop(id);
 }

 bool Library::removeBookById(const std::string& id)
 {
  std::lock_guard<std::mutex> lock(m_mutex);
-  m_bookDB->delete_document("Q" + id);
+  mp_impl->m_bookDB.delete_document("Q" + id);
  dropCache(id);
  // We do not change the cache size here
  // Most of the time, the book is remove in case of library refresh, it is
@@ -175,9 +221,9 @@ bool Library::removeBookById(const std::string& id)
  // Having a too big cache is not a problem here (or it would have been before)
  // (And setMaxSize doesn't actually reduce the cache size, extra cached items
  //  will be removed in put or getOrPut).
-  const bool bookWasRemoved = m_books.erase(id) == 1;
+  const bool bookWasRemoved = mp_impl->m_books.erase(id) == 1;
  if ( bookWasRemoved ) {
-    ++m_revision;
+    ++mp_impl->m_revision;
  }
  return bookWasRemoved;
 }
@@ -185,7 +231,7 @@ bool Library::removeBookById(const std::string& id)
 Library::Revision Library::getRevision() const
 {
  std::lock_guard<std::mutex> lock(m_mutex);
-  return m_revision;
+  return mp_impl->m_revision;
 }

 uint32_t Library::removeBooksNotUpdatedSince(Revision libraryRevision)
@@ -193,7 +239,7 @@ uint32_t Library::removeBooksNotUpdatedSince(Revision libraryRevision)
  BookIdCollection booksToRemove;
  {
    std::lock_guard<std::mutex> lock(m_mutex);
-    for ( const auto& entry : m_books) {
+    for ( const auto& entry : mp_impl->m_books) {
      if ( entry.second.lastUpdatedRevision <= libraryRevision ) {
        booksToRemove.push_back(entry.first);
      }
@@ -212,7 +258,7 @@ const Book& Library::getBookById(const std::string& id) const
 {
  // XXX: Doesn't make sense to lock this operation since it cannot
  // XXX: guarantee thread-safety because of its return type
-  return m_books.at(id);
+  return mp_impl->m_books.at(id);
 }

 Book Library::getBookByIdThreadSafe(const std::string& id) const
@@ -225,7 +271,7 @@ const Book& Library::getBookByPath(const std::string& path) const
 {
  // XXX: Doesn't make sense to lock this operation since it cannot
  // XXX: guarantee thread-safety because of its return type
-  for(auto& it: m_books) {
+  for(auto& it: mp_impl->m_books) {
    auto& book = it.second;
    if (book.getPath() == path)
      return book;
@@ -238,7 +284,7 @@ const Book& Library::getBookByPath(const std::string& path) const
 std::shared_ptr<zim::Archive> Library::getArchiveById(const std::string& id)
 {
  try {
-    return mp_archiveCache->getOrPut(id,
+    return mp_impl->mp_archiveCache->getOrPut(id,
    [&](){
      auto book = getBookById(id);
      if (!book.isPathValid()) {
@@ -255,7 +301,7 @@ std::shared_ptr<ZimSearcher> Library::getSearcherByIds(const BookIdSet& ids)
 {
  assert(!ids.empty());
  try {
-    return mp_searcherCache->getOrPut(ids,
+    return mp_impl->mp_searcherCache->getOrPut(ids,
    [&](){
      std::vector<zim::Archive> archives;
      for(auto& id:ids) {
@@ -276,7 +322,7 @@ unsigned int Library::getBookCount(const bool localBooks,
                                   const bool remoteBooks) const
 {
  std::lock_guard<std::mutex> lock(m_mutex);
-  return getBookCount_not_protected(localBooks, remoteBooks);
+  return mp_impl->getBookCount(localBooks, remoteBooks);
 }

 bool Library::writeToFile(const std::string& path) const
@@ -307,7 +353,7 @@ Library::AttributeCounts Library::getBookAttributeCounts(BookStrPropMemFn p) con
  std::lock_guard<std::mutex> lock(m_mutex);
  AttributeCounts propValueCounts;

-  for (const auto& pair: m_books) {
+  for (const auto& pair: mp_impl->m_books) {
    const auto& book = pair.second;
    if (book.getOrigId().empty()) {
      propValueCounts[(book.*p)()] += 1;
@@ -327,27 +373,12 @@ std::vector<std::string> Library::getBookPropValueSet(BookStrPropMemFn p) const

 std::vector<std::string> Library::getBooksLanguages() const
 {
-  std::vector<std::string> langs;
-  for ( const auto& langAndCount : getBooksLanguagesWithCounts() ) {
-    langs.push_back(langAndCount.first);
-  }
-  return langs;
+  return getBookPropValueSet(&Book::getLanguage);
 }

 Library::AttributeCounts Library::getBooksLanguagesWithCounts() const
 {
-  std::lock_guard<std::mutex> lock(m_mutex);
-  AttributeCounts langsWithCounts;
-
-  for (const auto& pair: m_books) {
-    const auto& book = pair.second;
-    if (book.getOrigId().empty()) {
-      for ( const auto& lang : book.getLanguages() ) {
-        ++langsWithCounts[lang];
-      }
-    }
-  }
-  return langsWithCounts;
+  return getBookAttributeCounts(&Book::getLanguage);
 }

 std::vector<std::string> Library::getBooksCategories() const
@@ -355,7 +386,7 @@ std::vector<std::string> Library::getBooksCategories() const
  std::lock_guard<std::mutex> lock(m_mutex);
  std::set<std::string> categories;

-  for (const auto& pair: m_books) {
+  for (const auto& pair: mp_impl->m_books) {
    const auto& book = pair.second;
    const auto& c = book.getCategory();
    if ( !c.empty() ) {
@@ -379,12 +410,12 @@ std::vector<std::string> Library::getBooksPublishers() const
 const std::vector<kiwix::Bookmark> Library::getBookmarks(bool onlyValidBookmarks) const
 {
  if (!onlyValidBookmarks) {
-    return m_bookmarks;
+    return mp_impl->m_bookmarks;
  }
  std::vector<kiwix::Bookmark> validBookmarks;
  auto booksId = getBooksIds();
  std::lock_guard<std::mutex> lock(m_mutex);
-  for(auto& bookmark:m_bookmarks) {
+  for(auto& bookmark:mp_impl->m_bookmarks) {
    if (std::find(booksId.begin(), booksId.end(), bookmark.getBookId()) != booksId.end()) {
      validBookmarks.push_back(bookmark);
    }
@@ -397,7 +428,7 @@ Library::BookIdCollection Library::getBooksIds() const
  std::lock_guard<std::mutex> lock(m_mutex);
  BookIdCollection bookIds;

-  for (auto& pair: m_books) {
+  for (auto& pair: mp_impl->m_books) {
    bookIds.push_back(pair.first);
  }

@@ -409,14 +440,12 @@ void Library::updateBookDB(const Book& book)
 {
  Xapian::Stem stemmer;
  Xapian::TermGenerator indexer;
-  const auto langs = book.getLanguages();
-  if ( langs.size() == 1 ) {
-    try {
-      stemmer = Xapian::Stem(iso639_3ToXapian(langs[0]));
-      indexer.set_stemmer(stemmer);
-      indexer.set_stemming_strategy(Xapian::TermGenerator::STEM_SOME);
-    } catch (...) {}
-  }
+  const std::string lang = book.getLanguage();
+  try {
+    stemmer = Xapian::Stem(iso639_3ToXapian(lang));
+    indexer.set_stemmer(stemmer);
+    indexer.set_stemming_strategy(Xapian::TermGenerator::STEM_SOME);
+  } catch (...) {}
  Xapian::Document doc;
  indexer.set_document(doc);

@@ -431,12 +460,10 @@ void Library::updateBookDB(const Book& book)
  // Index all fields for field-based search
  indexer.index_text(title, 1, "S");
  indexer.index_text(desc,  1, "XD");
-  for ( const auto& lang : langs ) {
-    indexer.index_text(lang,  1, "L");
-  }
+  indexer.index_text(lang,  1, "L");
  indexer.index_text(normalizeText(book.getCreator()),   1, "A");
  indexer.index_text(normalizeText(book.getPublisher()), 1, "XP");
-  doc.add_term("XN"+normalizeText(book.getName()));
+  indexer.index_text(normalizeText(book.getName()),      1, "XN");
  indexer.index_text(normalizeText(book.getCategory()),  1, "XC");

  for ( const auto& tag : split(normalizeText(book.getTags()), ";") ) {
@@ -452,7 +479,7 @@ void Library::updateBookDB(const Book& book)

  doc.set_data(book.getId());

-  m_bookDB->replace_document(idterm, doc);
+  mp_impl->m_bookDB.replace_document(idterm, doc);
 }

 namespace
@@ -503,30 +530,25 @@ Xapian::Query nameQuery(const std::string& name)
  return Xapian::Query("XN" + normalizeText(name));
 }

-Xapian::Query multipleParamQuery(const std::string& commaSeparatedList, const std::string& prefix)
+Xapian::Query categoryQuery(const std::string& category)
 {
-  Xapian::Query q;
-  bool firstIteration = true;
-  for ( const auto& elem : kiwix::split(commaSeparatedList, ",") ) {
-    const Xapian::Query singleQuery(prefix + normalizeText(elem));
-    if ( firstIteration ) {
-      q = singleQuery;
-      firstIteration = false;
-    } else {
-      q = Xapian::Query(Xapian::Query::OP_OR, q, singleQuery);
-    }
-  }
-  return q;
-}
-
-Xapian::Query categoryQuery(const std::string& commaSeparatedCategoryList)
-{
-  return multipleParamQuery(commaSeparatedCategoryList, "XC");
+  return Xapian::Query("XC" + normalizeText(category));
 }

 Xapian::Query langQuery(const std::string& commaSeparatedLanguageList)
 {
-  return multipleParamQuery(commaSeparatedLanguageList, "L");
+  Xapian::Query q;
+  bool firstIteration = true;
+  for ( const auto& lang : kiwix::split(commaSeparatedLanguageList, ",") ) {
+    const Xapian::Query singleLangQuery("L" + normalizeText(lang));
+    if ( firstIteration ) {
+      q = singleLangQuery;
+      firstIteration = false;
+    } else {
+      q = Xapian::Query(Xapian::Query::OP_OR, q, singleLangQuery);
+    }
+  }
+  return q;
 }

 Xapian::Query publisherQuery(const std::string& publisher)
@@ -601,9 +623,9 @@ Library::BookIdCollection Library::filterViaBookDB(const Filter& filter) const
  BookIdCollection bookIds;

  std::lock_guard<std::mutex> lock(m_mutex);
-  Xapian::Enquire enquire(*m_bookDB);
+  Xapian::Enquire enquire(mp_impl->m_bookDB);
  enquire.set_query(query);
-  const auto results = enquire.get_mset(0, m_books.size());
+  const auto results = enquire.get_mset(0, mp_impl->m_books.size());
  for ( auto it = results.begin(); it != results.end(); ++it  ) {
    bookIds.push_back(it.get_document().get_data());
  }
@@ -617,7 +639,7 @@ Library::BookIdCollection Library::filter(const Filter& filter) const
  const auto preliminaryResult = filterViaBookDB(filter);
  std::lock_guard<std::mutex> lock(m_mutex);
  for(auto id : preliminaryResult) {
-    if(filter.accept(m_books.at(id))) {
+    if(filter.accept(mp_impl->m_books.at(id))) {
      result.push_back(id);
    }
  }
@@ -837,18 +859,6 @@ Filter& Filter::name(std::string name)
  return *this;
 }

-Filter& Filter::clearLang()
-{
-  activeFilters &= ~LANG;
-  return *this;
-}
-
-Filter& Filter::clearCategory()
-{
-  activeFilters &= ~CATEGORY;
-  return *this;
-}
-
 #define ACTIVE(X) (activeFilters & (X))
 #define FILTER(TAG, TEST) if (ACTIVE(TAG) && !(TEST)) { return false; }
 bool Filter::hasQuery() const
--- a/src/library_dumper.cpp
+++ b/src/library_dumper.cpp
@@ -1,61 +0,0 @@
-#include "library_dumper.h"
-#include "tools/stringTools.h"
-#include "tools/otherTools.h"
-#include "tools.h"
-
-namespace kiwix
-{
-/* Constructor */
-LibraryDumper::LibraryDumper(const Library* library, const NameMapper* nameMapper)
-  : library(library),
-    nameMapper(nameMapper)
-{
-}
-/* Destructor */
-LibraryDumper::~LibraryDumper()
-{
-}
-
-void LibraryDumper::setOpenSearchInfo(int totalResults, int startIndex, int count)
-{
-  m_totalResults = totalResults;
-  m_startIndex = startIndex,
-  m_count = count;
-}
-
-kainjow::mustache::list LibraryDumper::getCategoryData() const
-{
-  const auto now = gen_date_str();
-  kainjow::mustache::list categoryData;
-  for ( const auto& category : library->getBooksCategories() ) {
-    const auto urlencodedCategoryName = urlEncode(category);
-    categoryData.push_back(kainjow::mustache::object{
-      {"name", category},
-      {"urlencoded_name",  urlencodedCategoryName},
-      {"updated", now},
-      {"id", gen_uuid(libraryId + "/categories/" + urlencodedCategoryName)}
-    });
-  }
-  return categoryData;
-}
-
-kainjow::mustache::list LibraryDumper::getLanguageData() const
-{
-  const auto now = gen_date_str();
-  kainjow::mustache::list languageData;
-  for ( const auto& langAndBookCount : library->getBooksLanguagesWithCounts() ) {
-    const std::string languageCode = langAndBookCount.first;
-    const int bookCount = langAndBookCount.second;
-    const auto languageSelfName = getLanguageSelfName(languageCode);
-    languageData.push_back(kainjow::mustache::object{
-      {"lang_code",  languageCode},
-      {"lang_self_name", languageSelfName},
-      {"book_count", to_string(bookCount)},
-      {"updated", now},
-      {"id", gen_uuid(libraryId + "/languages/" + languageCode)}
-    });
-  }
-  return languageData;
-}
-
-} // namespace kiwix
--- a/src/library_dumper.h
+++ b/src/library_dumper.h
@@ -1,91 +0,0 @@
-/*
- * Copyright 2023 Nikhil Tanwar <2002nikhiltanwar@gmail.com>
- * Copyright 2017 Matthieu Gautier <mgautier@kymeria.fr>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU  General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#ifndef KIWIX_LIBRARY_DUMPER_H
-#define KIWIX_LIBRARY_DUMPER_H
-
-#include <string>
-
-
-#include "library.h"
-#include "name_mapper.h"
-#include <mustache.hpp>
-
-namespace kiwix
-{
-
-/**
- * A base class to dump Library in various formats.
- *
- */
-class LibraryDumper
-{
- public:
-  LibraryDumper(const Library* library, const NameMapper* NameMapper);
-  ~LibraryDumper();
-
-  void setLibraryId(const std::string& id) { this->libraryId = id;}
-
-  /**
-   * Set the root location used when generating url.
-   *
-   * @param rootLocation the root location to use.
-   */
-  void setRootLocation(const std::string& rootLocation) { this->rootLocation = rootLocation; }
-
-  /**
-   * Set some informations about the search results.
-   *
-   * @param totalResult the total number of results of the search.
-   * @param startIndex the start index of the result.
-   * @param count the number of result of the current set (or page).
-   */
-  void setOpenSearchInfo(int totalResult, int startIndex, int count);
-  
-  /**
-   * Sets user default language
-   * 
-   * @param userLang the user language to be set
-   */
-  void setUserLanguage(std::string userLang) { this->m_userLang = userLang; }
-
-  /**
-   * Get the data of categories
-   */
-  kainjow::mustache::list getCategoryData() const;
-
-  /**
-   * Get the data of languages
-   */
-  kainjow::mustache::list getLanguageData() const;
-
- protected:
-  const kiwix::Library* const library;
-  const kiwix::NameMapper* const nameMapper;
-  std::string libraryId;
-  std::string rootLocation;
-  std::string m_userLang;
-  int m_totalResults;
-  int m_startIndex;
-  int m_count;
-};
-}
-
-#endif // KIWIX_LIBRARY_DUMPER_H
--- a/src/libxml_dumper.cpp
+++ b/src/libxml_dumper.cpp
@@ -54,7 +54,7 @@ void LibXMLDumper::handleBook(Book book, pugi::xml_node root_node) {
  if (book.getOrigId().empty()) {
    ADD_ATTR_NOT_EMPTY(entry_node, "title", book.getTitle());
    ADD_ATTR_NOT_EMPTY(entry_node, "description", book.getDescription());
-    ADD_ATTR_NOT_EMPTY(entry_node, "language", book.getCommaSeparatedLanguages());
+    ADD_ATTR_NOT_EMPTY(entry_node, "language", book.getLanguage());
    ADD_ATTR_NOT_EMPTY(entry_node, "creator", book.getCreator());
    ADD_ATTR_NOT_EMPTY(entry_node, "publisher", book.getPublisher());
    ADD_ATTR_NOT_EMPTY(entry_node, "name", book.getName());
@@ -97,7 +97,7 @@ void LibXMLDumper::handleBookmark(Bookmark bookmark, pugi::xml_node root_node) {
    auto book = library->getBookByIdThreadSafe(bookmark.getBookId());
    ADD_TEXT_ENTRY(book_node, "id", book.getId());
    ADD_TEXT_ENTRY(book_node, "title", book.getTitle());
-    ADD_TEXT_ENTRY(book_node, "language", book.getCommaSeparatedLanguages());
+    ADD_TEXT_ENTRY(book_node, "language", book.getLanguage());
    ADD_TEXT_ENTRY(book_node, "date", book.getDate());
  } catch (...) {
    ADD_TEXT_ENTRY(book_node, "id", bookmark.getBookId());
--- a/src/manager.cpp
+++ b/src/manager.cpp
@@ -27,12 +27,22 @@
 namespace kiwix
 {

+namespace
+{
+
+struct NoDelete
+{
+  template<class T> void operator()(T*) {}
+};
+
+} // unnamed namespace
+
 ////////////////////////////////////////////////////////////////////////////////
 // LibraryManipulator
 ////////////////////////////////////////////////////////////////////////////////

-LibraryManipulator::LibraryManipulator(LibraryPtr library)
-  : library(library)
+LibraryManipulator::LibraryManipulator(Library* library)
+  : library(*library)
 {}

 LibraryManipulator::~LibraryManipulator()
@@ -40,7 +50,7 @@ LibraryManipulator::~LibraryManipulator()

 bool LibraryManipulator::addBookToLibrary(const Book& book)
 {
-  const auto ret = library->addBook(book);
+  const auto ret = library.addBook(book);
  if ( ret ) {
    bookWasAddedToLibrary(book);
  }
@@ -49,13 +59,13 @@ bool LibraryManipulator::addBookToLibrary(const Book& book)

 void LibraryManipulator::addBookmarkToLibrary(const Bookmark& bookmark)
 {
-  library->addBookmark(bookmark);
+  library.addBookmark(bookmark);
  bookmarkWasAddedToLibrary(bookmark);
 }

 uint32_t LibraryManipulator::removeBooksNotUpdatedSince(Library::Revision rev)
 {
-  const auto n = library->removeBooksNotUpdatedSince(rev);
+  const auto n = library.removeBooksNotUpdatedSince(rev);
  if ( n != 0 ) {
    booksWereRemovedFromLibrary();
  }
@@ -79,15 +89,15 @@ void LibraryManipulator::booksWereRemovedFromLibrary()
 ////////////////////////////////////////////////////////////////////////////////

 /* Constructor */
-Manager::Manager(LibraryManipulator manipulator):
+Manager::Manager(LibraryManipulator* manipulator):
  writableLibraryPath(""),
-  manipulator(manipulator)
+  manipulator(manipulator, NoDelete())
 {
 }

-Manager::Manager(LibraryPtr library) :
+Manager::Manager(Library* library) :
  writableLibraryPath(""),
-  manipulator(LibraryManipulator(library))
+  manipulator(new LibraryManipulator(library))
 {
 }

@@ -111,7 +121,7 @@ bool Manager::parseXmlDom(const pugi::xml_document& doc,
    if (!trustLibrary && !book.getPath().empty()) {
      this->readBookFromPath(book.getPath(), &book);
    }
-    manipulator.addBookToLibrary(book);
+    manipulator->addBookToLibrary(book);
  }

  return true;
@@ -156,7 +166,7 @@ bool Manager::parseOpdsDom(const pugi::xml_document& doc, const std::string& url
    book.updateFromOpds(entryNode, urlHost);

    /* Update the book properties with the new importer */
-    manipulator.addBookToLibrary(book);
+    manipulator->addBookToLibrary(book);
  }

  return true;
@@ -228,10 +238,10 @@ std::string Manager::addBookFromPathAndGetId(const std::string& pathToOpen,
    }

    if (!checkMetaData
-        || (!book.getTitle().empty() && !book.getLanguages().empty()
+        || (checkMetaData && !book.getTitle().empty() && !book.getLanguage().empty()
            && !book.getDate().empty())) {
      book.setUrl(url);
-      manipulator.addBookToLibrary(book);
+      manipulator->addBookToLibrary(book);
      return book.getId();
    }
  }
@@ -286,7 +296,7 @@ bool Manager::readBookmarkFile(const std::string& path)

    bookmark.updateFromXml(node);

-    manipulator.addBookmarkToLibrary(bookmark);
+    manipulator->addBookmarkToLibrary(bookmark);
  }

  return true;
@@ -294,7 +304,7 @@ bool Manager::readBookmarkFile(const std::string& path)

 void Manager::reload(const Paths& paths)
 {
-  const auto libRevision = manipulator.getLibrary()->getRevision();
+  const auto libRevision = manipulator->getLibrary().getRevision();
  for (std::string path : paths) {
    if (!path.empty()) {
      if ( kiwix::isRelativePath(path) )
@@ -306,7 +316,7 @@ void Manager::reload(const Paths& paths)
    }
  }

-  manipulator.removeBooksNotUpdatedSince(libRevision);
+  manipulator->removeBooksNotUpdatedSince(libRevision);
 }

 }
--- a/src/meson.build
+++ b/src/meson.build
@@ -5,8 +5,6 @@ kiwix_sources = [
  'manager.cpp',
  'libxml_dumper.cpp',
  'opds_dumper.cpp',
-  'html_dumper.cpp',
-  'library_dumper.cpp',
  'downloader.cpp',
  'server.cpp',
  'search_renderer.cpp',
@@ -17,8 +15,6 @@ kiwix_sources = [
  'tools/regexTools.cpp',
  'tools/stringTools.cpp',
  'tools/networkTools.cpp',
-  'tools/opdsParsingTools.cpp',
-  'tools/languageTools.cpp',
  'tools/otherTools.cpp',
  'tools/archiveTools.cpp',
  'kiwixserve.cpp',
@@ -28,7 +24,7 @@ kiwix_sources = [
  'server/request_context.cpp',
  'server/response.cpp',
  'server/internalServer.cpp',
-  'server/internalServer_catalog.cpp',
+  'server/internalServer_catalog_v2.cpp',
  'server/i18n.cpp',
  'opds_catalog.cpp',
  'version.cpp'
--- a/src/name_mapper.cpp
+++ b/src/name_mapper.cpp
@@ -63,7 +63,7 @@ std::string HumanReadableNameMapper::getIdForName(const std::string& name) const
 // UpdatableNameMapper
 ////////////////////////////////////////////////////////////////////////////////

-UpdatableNameMapper::UpdatableNameMapper(LibraryPtr lib, bool withAlias)
+UpdatableNameMapper::UpdatableNameMapper(Library& lib, bool withAlias)
  : library(lib)
  , withAlias(withAlias)
 {
@@ -72,7 +72,7 @@ UpdatableNameMapper::UpdatableNameMapper(LibraryPtr lib, bool withAlias)

 void UpdatableNameMapper::update()
 {
-  const auto newNameMapper = new HumanReadableNameMapper(*library, withAlias);
+  const auto newNameMapper = new HumanReadableNameMapper(library, withAlias);
  std::lock_guard<std::mutex> lock(mutex);
  nameMapper.reset(newNameMapper);
 }
--- a/src/opds_dumper.cpp
+++ b/src/opds_dumper.cpp
@@ -30,8 +30,9 @@ namespace kiwix
 {

 /* Constructor */
-OPDSDumper::OPDSDumper(const Library* library, const NameMapper* nameMapper)
-  : LibraryDumper(library, nameMapper)
+OPDSDumper::OPDSDumper(Library* library, NameMapper* nameMapper)
+  : library(library),
+    nameMapper(nameMapper)
 {
 }
 /* Destructor */
@@ -39,6 +40,13 @@ OPDSDumper::~OPDSDumper()
 {
 }

+void OPDSDumper::setOpenSearchInfo(int totalResults, int startIndex, int count)
+{
+  m_totalResults = totalResults;
+  m_startIndex = startIndex,
+  m_count = count;
+}
+
 namespace
 {

@@ -73,7 +81,7 @@ std::string fullEntryXML(const Book& book, const std::string& rootLocation, cons
      {"name", book.getName()},
      {"title", book.getTitle()},
      {"description", book.getDescription()},
-      {"language", book.getCommaSeparatedLanguages()},
+      {"language", book.getLanguage()},
      {"content_id",  urlEncode(contentId)},
      {"updated", bookDate}, // XXX: this should be the entry update datetime
      {"book_date", bookDate},
@@ -125,6 +133,59 @@ BooksData getBooksData(const Library* library, const NameMapper* nameMapper, con
  return booksData;
 }

+std::map<std::string, std::string> iso639_3 = {
+  {"atj", "atikamekw"},
+  {"azb", "آذربایجان دیلی"},
+  {"bcl", "central bikol"},
+  {"bgs", "tagabawa"},
+  {"bxr", "буряад хэлэн"},
+  {"cbk", "chavacano"},
+  {"cdo", "閩東語"},
+  {"dag", "Dagbani"},
+  {"diq", "dimli"},
+  {"dty", "डोटेली"},
+  {"eml", "emiliân-rumagnōl"},
+  {"fbs", "српскохрватски"},
+  {"ido", "ido"},
+  {"kbp", "kabɩyɛ"},
+  {"kld", "Gamilaraay"},
+  {"lbe", "лакку маз"},
+  {"lbj", "ལ་དྭགས་སྐད་"},
+  {"map", "Austronesian"},
+  {"mhr", "марий йылме"},
+  {"mnw", "ဘာသာမန်"},
+  {"myn", "mayan"},
+  {"nah", "nahuatl"},
+  {"nai", "north American Indian"},
+  {"nds", "plattdütsch"},
+  {"nrm", "bhasa narom"},
+  {"olo", "livvi"},
+  {"pih", "Pitcairn-Norfolk"},
+  {"pnb", "Western Panjabi"},
+  {"rmr", "Caló"},
+  {"rmy", "romani shib"},
+  {"roa", "romance languages"},
+  {"twi", "twi"}
+};
+
+std::once_flag fillLanguagesFlag;
+
+void fillLanguagesMap()
+{
+  for (auto icuLangPtr = icu::Locale::getISOLanguages(); *icuLangPtr != NULL; ++icuLangPtr) {
+    const ICULanguageInfo lang(*icuLangPtr);
+    iso639_3.insert({lang.iso3Code(), lang.selfName()});
+  }
+}
+
+std::string getLanguageSelfName(const std::string& lang) {
+  const auto itr = iso639_3.find(lang);
+  if (itr != iso639_3.end()) {
+    return itr->second;
+  }
+  return lang;
+};
+
 } // unnamed namespace

 string OPDSDumper::dumpOPDSFeed(const std::vector<std::string>& bookIds, const std::string& query) const
@@ -150,17 +211,17 @@ string OPDSDumper::dumpOPDSFeedV2(const std::vector<std::string>& bookIds, const
  const auto booksData = getBooksData(library, nameMapper, bookIds, rootLocation, partial);

  const char* const endpoint = partial ? "/partial_entries" : "/entries";
-  const std::string url = endpoint + (query.empty() ? "" : "?" + query);
  const kainjow::mustache::object template_data{
     {"date", gen_date_str()},
     {"endpoint_root", endpointRoot},
     {"feed_id", gen_uuid(libraryId + endpoint + "?" + query)},
     {"filter", onlyAsNonEmptyMustacheValue(query)},
-     {"self_url", url},
+     {"query", query.empty() ? "" : "?" + query},
     {"totalResults", to_string(m_totalResults)},
     {"startIndex", to_string(m_startIndex)},
     {"itemsPerPage", to_string(m_count)},
-     {"books", booksData }
+     {"books", booksData },
+     {"dump_partial_entries", MustacheData(partial)}
  };

  return render_template(RESOURCE::templates::catalog_v2_entries_xml, template_data);
@@ -178,7 +239,17 @@ std::string OPDSDumper::dumpOPDSCompleteEntry(const std::string& bookId) const
 std::string OPDSDumper::categoriesOPDSFeed() const
 {
  const auto now = gen_date_str();
-  kainjow::mustache::list categoryData = getCategoryData();
+  kainjow::mustache::list categoryData;
+  for ( const auto& category : library->getBooksCategories() ) {
+    const auto urlencodedCategoryName = urlEncode(category);
+    categoryData.push_back(kainjow::mustache::object{
+      {"name", category},
+      {"urlencoded_name",  urlencodedCategoryName},
+      {"updated", now},
+      {"id", gen_uuid(libraryId + "/categories/" + urlencodedCategoryName)}
+    });
+  }
+
  return render_template(
             RESOURCE::templates::catalog_v2_categories_xml,
             kainjow::mustache::object{
@@ -193,7 +264,21 @@ std::string OPDSDumper::categoriesOPDSFeed() const
 std::string OPDSDumper::languagesOPDSFeed() const
 {
  const auto now = gen_date_str();
-  kainjow::mustache::list languageData = getLanguageData();
+  kainjow::mustache::list languageData;
+  std::call_once(fillLanguagesFlag, fillLanguagesMap);
+  for ( const auto& langAndBookCount : library->getBooksLanguagesWithCounts() ) {
+    const std::string languageCode = langAndBookCount.first;
+    const int bookCount = langAndBookCount.second;
+    const auto languageSelfName = getLanguageSelfName(languageCode);
+    languageData.push_back(kainjow::mustache::object{
+      {"lang_code",  languageCode},
+      {"lang_self_name", languageSelfName},
+      {"book_count", to_string(bookCount)},
+      {"updated", now},
+      {"id", gen_uuid(libraryId + "/languages/" + languageCode)}
+    });
+  }
+
  return render_template(
             RESOURCE::templates::catalog_v2_languages_xml,
             kainjow::mustache::object{
--- a/src/search_renderer.cpp
+++ b/src/search_renderer.cpp
@@ -36,9 +36,16 @@ namespace kiwix
 {

 /* Constructor */
-SearchRenderer::SearchRenderer(zim::SearchResultSet srs,
+SearchRenderer::SearchRenderer(zim::SearchResultSet srs, NameMapper* mapper,
+                      unsigned int start, unsigned int estimatedResultCount)
+    : SearchRenderer(srs, mapper, nullptr, start, estimatedResultCount)
+{}
+
+SearchRenderer::SearchRenderer(zim::SearchResultSet srs, NameMapper* mapper, Library* library,
                      unsigned int start, unsigned int estimatedResultCount)
    : m_srs(srs),
+      mp_nameMapper(mapper),
+      mp_library(library),
      protocolPrefix("zim://"),
      searchProtocolPrefix("search://"),
      estimatedResultCount(estimatedResultCount),
@@ -157,7 +164,7 @@ kainjow::mustache::data buildPagination(
  return pagination;
 }

-std::string SearchRenderer::renderTemplate(const std::string& tmpl_str, const NameMapper& nameMapper, const Library* library)
+std::string SearchRenderer::renderTemplate(const std::string& tmpl_str)
 {
  const std::string absPathPrefix = protocolPrefix;
  // Build the results list
@@ -165,12 +172,12 @@ std::string SearchRenderer::renderTemplate(const std::string& tmpl_str, const Na
  for (auto it = m_srs.begin(); it != m_srs.end(); it++) {
    kainjow::mustache::data result;
    const std::string zim_id(it.getZimId());
-    const auto path = nameMapper.getNameForId(zim_id) + "/" + it.getPath();
+    const auto path = mp_nameMapper->getNameForId(zim_id) + "/" + it.getPath();
    result.set("title", it.getTitle());
    result.set("absolutePath", absPathPrefix + urlEncode(path));
    result.set("snippet", it.getSnippet());
-    if (library) {
-      result.set("bookTitle", library->getBookById(zim_id).getTitle());
+    if (mp_library) {
+      result.set("bookTitle", mp_library->getBookById(zim_id).getTitle());
    }
    if (it.getWordCount() >= 0) {
      result.set("wordCount", kiwix::beautifyInteger(it.getWordCount()));
@@ -215,14 +222,14 @@ std::string SearchRenderer::renderTemplate(const std::string& tmpl_str, const Na
  return ss.str();
 }

-std::string SearchRenderer::getHtml(const NameMapper& mapper, const Library* library)
+std::string SearchRenderer::getHtml()
 {
-  return renderTemplate(RESOURCE::templates::search_result_html, mapper, library);
+  return renderTemplate(RESOURCE::templates::search_result_html);
 }

-std::string SearchRenderer::getXml(const NameMapper& mapper, const Library* library)
+std::string SearchRenderer::getXml()
 {
-  return renderTemplate(RESOURCE::templates::search_result_xml, mapper, library);
+  return renderTemplate(RESOURCE::templates::search_result_xml);
 }


--- a/src/server.cpp
+++ b/src/server.cpp
@@ -29,7 +29,7 @@

 namespace kiwix {

-Server::Server(LibraryPtr library, std::shared_ptr<NameMapper> nameMapper) :
+Server::Server(Library* library, NameMapper* nameMapper) :
  mp_library(library),
  mp_nameMapper(nameMapper),
  mp_server(nullptr)
--- a/src/server/i18n.h
+++ b/src/server/i18n.h
@@ -69,28 +69,6 @@ private:
  const std::string m_lang;
 };

-class GetTranslatedStringWithMsgId
-{
-  typedef kainjow::mustache::basic_data<std::string> MustacheString;
-  typedef std::pair<std::string, MustacheString> MsgIdAndTranslation;
-
-public:
-  explicit GetTranslatedStringWithMsgId(const std::string& lang) : m_lang(lang) {}
-
-  MsgIdAndTranslation operator()(const std::string& key) const
-  {
-    return {key, getTranslatedString(m_lang, key)};
-  }
-
-  MsgIdAndTranslation operator()(const std::string& key, const Parameters& params) const
-  {
-    return {key, expandParameterizedString(m_lang, key, params)};
-  }
-
-private:
-  const std::string m_lang;
-};
-
 } // namespace i18n

 struct ParameterizedMessage
--- a/src/server/internalServer.cpp
+++ b/src/server/internalServer.cpp
@@ -19,7 +19,7 @@

 #include "internalServer.h"

-#ifndef _WIN32
+#ifdef __FreeBSD__
 #include <netinet/in.h>
 #endif

@@ -53,7 +53,6 @@ extern "C" {
 #include "name_mapper.h"
 #include "search_renderer.h"
 #include "opds_dumper.h"
-#include "html_dumper.h"
 #include "i18n.h"

 #include <zim/uuid.h>
@@ -95,22 +94,6 @@ inline std::string normalizeRootUrl(std::string rootUrl)
  return rootUrl.empty() ? rootUrl : "/" + rootUrl;
 }

-std::string
-fullURL2LocalURL(const std::string& fullUrl, const std::string& rootLocation)
-{
-  if ( kiwix::startsWith(fullUrl, rootLocation) ) {
-    return fullUrl.substr(rootLocation.size());
-  } else {
-    return "INVALID URL";
-  }
-}
-
-std::string getSearchComponent(const RequestContext& request)
-{
-    const std::string query = request.get_query();
-    return query.empty() ? query : "?" + query;
-}
-
 Filter get_search_filter(const RequestContext& request, const std::string& prefix="")
 {
    auto filter = kiwix::Filter().valid(true).local(true);
@@ -224,8 +207,7 @@ typedef std::set<std::string> Languages;
 Languages getLanguages(const Library& lib, const Library::BookIdSet& bookIds) {
  Languages langs;
  for ( const auto& b : bookIds ) {
-    const auto bookLangs = lib.getBookById(b).getLanguages();
-    langs.insert(bookLangs.begin(), bookLangs.end());
+    langs.insert(lib.getBookById(b).getLanguage());
  }
  return langs;
 }
@@ -254,11 +236,6 @@ get_matching_if_none_match_etag(const RequestContext& r, const std::string& etag
  }
 }

-struct NoDelete
-{
-  template<class T> void operator()(T*) {}
-};
-
 } // unnamed namespace

 std::pair<std::string, Library::BookIdSet> InternalServer::selectBooks(const RequestContext& request) const
@@ -268,7 +245,7 @@ std::pair<std::string, Library::BookIdSet> InternalServer::selectBooks(const Req
    auto bookName = request.get_argument("content");
    try {
      const auto bookIds = Library::BookIdSet{mp_nameMapper->getIdForName(bookName)};
-      const auto queryString = request.get_query([&](const std::string& key){return key == "content";}, true);
+      const auto queryString = request.get_query([&](const std::string& key){return key == "content";});
      return {queryString, bookIds};
    } catch (const std::out_of_range&) {
      throw Error(noSuchBookErrorMsg(bookName));
@@ -293,7 +270,7 @@ std::pair<std::string, Library::BookIdSet> InternalServer::selectBooks(const Req
      }
    }
    const auto bookIds = Library::BookIdSet(id_vec.begin(), id_vec.end());
-    const auto queryString = request.get_query([&](const std::string& key){return key == "books.id";}, true);
+    const auto queryString = request.get_query([&](const std::string& key){return key == "books.id";});
    return {queryString, bookIds};
  } catch(const std::out_of_range&) {}

@@ -311,7 +288,7 @@ std::pair<std::string, Library::BookIdSet> InternalServer::selectBooks(const Req
        throw Error(noSuchBookErrorMsg(bookName));
      }
    }
-    const auto queryString = request.get_query([&](const std::string& key){return key == "books.name";}, true);
+    const auto queryString = request.get_query([&](const std::string& key){return key == "books.name";});
    return {queryString, bookIds};
  } catch(const std::out_of_range&) {}

@@ -322,7 +299,7 @@ std::pair<std::string, Library::BookIdSet> InternalServer::selectBooks(const Req
    throw Error(nonParameterizedMessage("no-book-found"));
  }
  const auto bookIds = Library::BookIdSet(id_vec.begin(), id_vec.end());
-  const auto queryString = request.get_query([&](const std::string& key){return startsWith(key, "books.filter.");}, true);
+  const auto queryString = request.get_query([&](const std::string& key){return startsWith(key, "books.filter.");});
  return {queryString, bookIds};
 }

@@ -411,8 +388,8 @@ public:
 };


-InternalServer::InternalServer(LibraryPtr library,
-                               std::shared_ptr<NameMapper> nameMapper,
+InternalServer::InternalServer(Library* library,
+                               NameMapper* nameMapper,
                               std::string addr,
                               int port,
                               std::string root,
@@ -427,7 +404,6 @@ InternalServer::InternalServer(LibraryPtr library,
  m_addr(addr),
  m_port(port),
  m_root(normalizeRootUrl(root)),
-  m_rootPrefixOfDecodedURL(m_root),
  m_nbThreads(nbThreads),
  m_multizimSearchLimit(multizimSearchLimit),
  m_verbose(verbose),
@@ -438,13 +414,11 @@ InternalServer::InternalServer(LibraryPtr library,
  m_ipConnectionLimit(ipConnectionLimit),
  mp_daemon(nullptr),
  mp_library(library),
-  mp_nameMapper(nameMapper ? nameMapper : std::shared_ptr<NameMapper>(&defaultNameMapper, NoDelete())),
+  mp_nameMapper(nameMapper ? nameMapper : &defaultNameMapper),
  searchCache(getEnvVar<int>("KIWIX_SEARCH_CACHE_SIZE", DEFAULT_CACHE_SIZE)),
  suggestionSearcherCache(getEnvVar<int>("KIWIX_SUGGESTION_SEARCHER_CACHE_SIZE", std::max((unsigned int) (mp_library->getBookCount(true, true)*0.1), 1U))),
  m_customizedResources(new CustomizedResources)
-{
-  m_root = urlEncode(m_root);
-}
+{}

 InternalServer::~InternalServer() = default;

@@ -520,7 +494,7 @@ static MHD_Result staticHandlerCallback(void* cls,
 }

 MHD_Result InternalServer::handlerCallback(struct MHD_Connection* connection,
-                                           const char* fullUrl,
+                                           const char* url,
                                           const char* method,
                                           const char* version,
                                           const char* upload_data,
@@ -531,10 +505,8 @@ MHD_Result InternalServer::handlerCallback(struct MHD_Connection* connection,
  if (m_verbose.load() ) {
    printf("======================\n");
    printf("Requesting : \n");
-    printf("full_url  : %s\n", fullUrl);
+    printf("full_url  : %s\n", url);
  }
-
-  const auto url = fullURL2LocalURL(fullUrl, m_rootPrefixOfDecodedURL);
  RequestContext request(connection, m_root, url, method, version);

  if (m_verbose.load() ) {
@@ -555,7 +527,7 @@ MHD_Result InternalServer::handlerCallback(struct MHD_Connection* connection,
    printf("========== INTERNAL ERROR !! ============\n");
    if (!m_verbose.load()) {
      printf("Requesting : \n");
-      printf("full_url : %s\n", fullUrl);
+      printf("full_url : %s\n", url);
      request.print_debug_info();
    }
  }
@@ -597,13 +569,6 @@ std::unique_ptr<Response> InternalServer::handle_request(const RequestContext& r
             + urlNotFoundMsg;
    }

-    if ( request.get_url() == "" ) {
-      // Redirect /ROOT_LOCATION to /ROOT_LOCATION/ (note the added slash)
-      // so that relative URLs are resolved correctly
-      const std::string query = getSearchComponent(request);
-      return Response::build_redirect(*this, m_root + "/" + query);
-    }
-
    const ETag etag = get_matching_if_none_match_etag(request, getLibraryId());
    if ( etag )
      return Response::build_304(*this, etag);
@@ -633,9 +598,6 @@ std::unique_ptr<Response> InternalServer::handle_request(const RequestContext& r
    if (isEndpointUrl(url, "search"))
      return handle_search(request);

-    if (isEndpointUrl(url, "nojs"))
-      return handle_no_js(request);
-
    if (isEndpointUrl(url, "suggest"))
     return handle_suggest(request);

@@ -645,9 +607,11 @@ std::unique_ptr<Response> InternalServer::handle_request(const RequestContext& r
    if (isEndpointUrl(url, "catch"))
      return handle_catch(request);

-    const std::string contentUrl = m_root + "/content" + urlEncode(url);
-    const std::string query = getSearchComponent(request);
-    return Response::build_redirect(*this, contentUrl + query);
+    std::string contentUrl = m_root + "/content" + url;
+    const std::string query = request.get_query();
+    if ( ! query.empty() )
+      contentUrl += "?" + query;
+    return Response::build_redirect(*this, contentUrl);
  } catch (std::exception& e) {
    fprintf(stderr, "===== Unhandled error : %s\n", e.what());
    return HTTP500Response(*this, request)
@@ -759,79 +723,11 @@ std::unique_ptr<Response> InternalServer::handle_viewer_settings(const RequestCo
  const kainjow::mustache::object data{
    {"enable_toolbar", m_withTaskbar ? "true" : "false" },
    {"enable_link_blocking", m_blockExternalLinks ? "true" : "false" },
-    {"enable_library_button", m_withLibraryButton ? "true" : "false" },
-    {"default_user_language", request.get_user_language() }
+    {"enable_library_button", m_withLibraryButton ? "true" : "false" }
  };
  return ContentResponse::build(*this, RESOURCE::templates::viewer_settings_js, data, "application/javascript; charset=utf-8");
 }

-std::string InternalServer::getNoJSDownloadPageHTML(const std::string& bookId, const std::string& userLang) const
-{
-  const auto book = mp_library->getBookById(bookId);
-  auto bookUrl = kiwix::stripSuffix(book.getUrl(), ".meta4");
-  auto getTranslation = i18n::GetTranslatedStringWithMsgId(userLang);
-  const auto translations = kainjow::mustache::object{
-                            getTranslation("download-links-heading", {{"BOOK_TITLE", book.getTitle()}}),
-                            getTranslation("download-links-title"),
-                            getTranslation("direct-download-link-text"),
-                            getTranslation("hash-download-link-text"),
-                            getTranslation("magnet-link-text"),
-                            getTranslation("torrent-download-link-text")
-  };
-
-  return render_template(
-             RESOURCE::templates::no_js_download_html,
-             kainjow::mustache::object{
-               {"url", bookUrl},
-               {"translations", translations}
-             }
-  );
-}
-
-std::unique_ptr<Response> InternalServer::handle_no_js(const RequestContext& request)
-{
-  const auto url = request.get_url();
-  const auto urlParts = kiwix::split(url, "/", true, false);
-  HTMLDumper htmlDumper(mp_library.get(), mp_nameMapper.get());
-  htmlDumper.setRootLocation(m_root);
-  htmlDumper.setLibraryId(getLibraryId());
-  auto userLang = request.get_user_language();
-  htmlDumper.setUserLanguage(userLang);
-  std::string content;
-
-  if (urlParts.size() == 1) {
-    auto filter = get_search_filter(request);
-    try {
-      if (request.get_argument("category") == "") {
-        filter.clearCategory();
-      }
-    } catch (...) {}
-    try {
-      if (request.get_argument("lang") == "") {
-        filter.clearLang();
-      }
-    } catch (...) {}
-    content = htmlDumper.dumpPlainHTML(filter);
-  } else if ((urlParts.size() == 3) && (urlParts[1] == "download")) {
-    try {
-      const auto bookId = mp_nameMapper->getIdForName(urlParts[2]);
-      content = getNoJSDownloadPageHTML(bookId, userLang);
-    } catch (const std::out_of_range&) {
-      return HTTP404Response(*this, request)
-           + urlNotFoundMsg;
-    }
-  } else {
-    return HTTP404Response(*this, request)
-           + urlNotFoundMsg;
-  }
-
-  return ContentResponse::build(
-             *this,
-             content,
-             "text/html; charset=utf-8"
-  );
-}
-
 namespace
 {

@@ -963,7 +859,7 @@ std::unique_ptr<Response> InternalServer::handle_search_request(const RequestCon
  const auto pageLength = getSearchPageSize(request);

  /* Get the results */
-  SearchRenderer renderer(search->getResults(start-1, pageLength), start,
+  SearchRenderer renderer(search->getResults(start-1, pageLength), mp_nameMapper, mp_library, start,
                          search->getEstimatedMatches());
  renderer.setSearchPattern(searchInfo.pattern);
  renderer.setSearchBookQuery(searchInfo.bookFilterQuery);
@@ -971,17 +867,9 @@ std::unique_ptr<Response> InternalServer::handle_search_request(const RequestCon
  renderer.setSearchProtocolPrefix(m_root + "/search");
  renderer.setPageLength(pageLength);
  if (request.get_requested_format() == "xml") {
-    return ContentResponse::build(
-      *this,
-      renderer.getXml(*mp_nameMapper, mp_library.get()),
-      "application/rss+xml; charset=utf-8"
-    );
+    return ContentResponse::build(*this, renderer.getXml(), "application/rss+xml; charset=utf-8");
  }
-  auto response = ContentResponse::build(
-    *this,
-    renderer.getHtml(*mp_nameMapper, mp_library.get()),
-    "text/html; charset=utf-8"
-  );
+  auto response = ContentResponse::build(*this, renderer.getHtml(), "text/html; charset=utf-8");
  // XXX: Now this has to be handled by the iframe-based viewer which
  // XXX: has to resolve if the book selection resulted in a single book.
  /*
@@ -1060,6 +948,56 @@ std::unique_ptr<Response> InternalServer::handle_catch(const RequestContext& req
         + urlNotFoundMsg;
 }

+std::unique_ptr<Response> InternalServer::handle_catalog(const RequestContext& request)
+{
+  if (m_verbose.load()) {
+    printf("** running handle_catalog");
+  }
+
+  std::string host;
+  std::string url;
+  try {
+    host = request.get_header("Host");
+    url  = request.get_url_part(1);
+  } catch (const std::out_of_range&) {
+    return HTTP404Response(*this, request)
+           + urlNotFoundMsg;
+  }
+
+  if (url == "v2") {
+    return handle_catalog_v2(request);
+  }
+
+  if (url != "searchdescription.xml" && url != "root.xml" && url != "search") {
+    return HTTP404Response(*this, request)
+           + urlNotFoundMsg;
+  }
+
+  if (url == "searchdescription.xml") {
+    auto response = ContentResponse::build(*this, RESOURCE::opensearchdescription_xml, get_default_data(), "application/opensearchdescription+xml");
+    return std::move(response);
+  }
+
+  zim::Uuid uuid;
+  kiwix::OPDSDumper opdsDumper(mp_library, mp_nameMapper);
+  opdsDumper.setRootLocation(m_root);
+  opdsDumper.setLibraryId(getLibraryId());
+  std::vector<std::string> bookIdsToDump;
+  if (url == "root.xml") {
+    uuid = zim::Uuid::generate(host);
+    bookIdsToDump = mp_library->filter(kiwix::Filter().valid(true).local(true).remote(true));
+  } else if (url == "search") {
+    bookIdsToDump = search_catalog(request, opdsDumper);
+    uuid = zim::Uuid::generate();
+  }
+
+  auto response = ContentResponse::build(
+      *this,
+      opdsDumper.dumpOPDSFeed(bookIdsToDump, request.get_query()),
+      "application/atom+xml; profile=opds-catalog; kind=acquisition; charset=utf-8");
+  return std::move(response);
+}
+
 std::vector<std::string>
 InternalServer::search_catalog(const RequestContext& request,
                               kiwix::OPDSDumper& opdsDumper)
@@ -1067,9 +1005,9 @@ InternalServer::search_catalog(const RequestContext& request,
    const auto filter = get_search_filter(request);
    std::vector<std::string> bookIdsToDump = mp_library->filter(filter);
    const auto totalResults = bookIdsToDump.size();
-    const long count = request.get_optional_param("count", 10L);
+    const size_t count = request.get_optional_param("count", 10UL);
    const size_t startIndex = request.get_optional_param("start", 0UL);
-    const size_t intendedCount = count >= 0 ? count : bookIdsToDump.size();
+    const size_t intendedCount = count > 0 ? count : bookIdsToDump.size();
    bookIdsToDump = subrange(bookIdsToDump, startIndex, intendedCount);
    opdsDumper.setOpenSearchInfo(totalResults, startIndex, bookIdsToDump.size());
    return bookIdsToDump;
@@ -1087,37 +1025,14 @@ ParameterizedMessage suggestSearchMsg(const std::string& searchURL, const std::s
                              });
 }

-///////////////////////////////////////////////////////////////////////////////
-// The content security policy below is set on responses to the /content
-// endpoint in order to prevent the ZIM content from interfering with the
-// viewer (e.g. breaking out of the viewer iframe by performing top-level
-// navigation).
-const std::string CONTENT_CSP_HEADER =
-    "default-src 'self' "
-                "data: "
-                "blob: "
-                "about: "
-                "'unsafe-inline' "
-                "'unsafe-eval'; "
-
-    "sandbox allow-scripts "
-            "allow-same-origin "
-            "allow-modals "
-            "allow-popups "
-            "allow-forms "
-            "allow-downloads;";
-
-// End of content security policy
-///////////////////////////////////////////////////////////////////////////////
-
 } // unnamed namespace

 std::unique_ptr<Response>
 InternalServer::build_redirect(const std::string& bookName, const zim::Item& item) const
 {
-  const auto contentPath = "/content/" + bookName + "/" + item.getPath();
-  const auto url = m_root + kiwix::urlEncode(contentPath);
-  return Response::build_redirect(*this, url);
+  const auto path = kiwix::urlEncode(item.getPath());
+  const auto redirectUrl = m_root + "/content/" + bookName + "/" + path;
+  return Response::build_redirect(*this, redirectUrl);
 }

 std::unique_ptr<Response> InternalServer::handle_content(const RequestContext& request)
@@ -1171,13 +1086,6 @@ std::unique_ptr<Response> InternalServer::handle_content(const RequestContext& r
    auto response = ItemResponse::build(*this, request, entry.getItem());
    response->set_etag_body(archiveUuid);

-    if ( !startsWith(entry.getItem().getMimetype(), "application/pdf") ) {
-      // NOTE: Content security policy is not applied to PDF content so that
-      // NOTE: it can be displayed in the viewer in Chromium-based browsers.
-      response->add_header("Content-Security-Policy", CONTENT_CSP_HEADER);
-      response->add_header("Referrer-Policy", "no-referrer");
-    }
-
    if (m_verbose.load()) {
      printf("Found %s\n", entry.getPath().c_str());
      printf("mimeType: %s\n", entry.getItem(true).getMimetype().c_str());
--- a/src/server/internalServer.h
+++ b/src/server/internalServer.h
@@ -92,8 +92,8 @@ class OPDSDumper;

 class InternalServer {
  public:
-    InternalServer(LibraryPtr library,
-                   std::shared_ptr<NameMapper> nameMapper,
+    InternalServer(Library* library,
+                   NameMapper* nameMapper,
                   std::string addr,
                   int port,
                   std::string root,
@@ -131,7 +131,6 @@ class InternalServer {
    std::unique_ptr<Response> handle_catalog_v2_entries(const RequestContext& request, bool partial);
    std::unique_ptr<Response> handle_catalog_v2_complete_entry(const RequestContext& request, const std::string& entryId);
    std::unique_ptr<Response> handle_catalog_v2_categories(const RequestContext& request);
-    std::unique_ptr<Response> handle_no_js(const RequestContext& request);
    std::unique_ptr<Response> handle_catalog_v2_languages(const RequestContext& request);
    std::unique_ptr<Response> handle_catalog_v2_illustration(const RequestContext& request);
    std::unique_ptr<Response> handle_search(const RequestContext& request);
@@ -156,8 +155,6 @@ class InternalServer {

    std::string getLibraryId() const;

-    std::string getNoJSDownloadPageHTML(const std::string& bookId, const std::string& userLang) const;
-
  private: // types
    class LockableSuggestionSearcher;
    typedef ConcurrentCache<SearchInfo, std::shared_ptr<zim::Search>> SearchCache;
@@ -166,8 +163,7 @@ class InternalServer {
  private: // data
    std::string m_addr;
    int m_port;
-    std::string m_root;                   // URI-encoded
-    std::string m_rootPrefixOfDecodedURL; // URI-decoded
+    std::string m_root;
    int m_nbThreads;
    unsigned int m_multizimSearchLimit;
    std::atomic_bool m_verbose;
@@ -178,8 +174,8 @@ class InternalServer {
    int m_ipConnectionLimit;
    struct MHD_Daemon* mp_daemon;

-    LibraryPtr mp_library;
-    std::shared_ptr<NameMapper> mp_nameMapper;
+    Library* mp_library;
+    NameMapper* mp_nameMapper;

    SearchCache searchCache;
    SuggestionSearcherCache suggestionSearcherCache;
--- a/src/server/internalServer_catalog_v2.cpp
+++ b/src/server/internalServer_catalog_v2.cpp
@@ -33,74 +33,6 @@

 namespace kiwix {

-namespace
-{
-
-enum OPDSResponseKind
-{
-  OPDS_ENTRY,
-  OPDS_NAVIGATION_FEED,
-  OPDS_ACQUISITION_FEED
-};
-
-const std::string opdsMimeType[] = {
-  "application/atom+xml;type=entry;profile=opds-catalog;charset=utf-8",
-  "application/atom+xml;profile=opds-catalog;kind=navigation;charset=utf-8",
-  "application/atom+xml;profile=opds-catalog;kind=acquisition;charset=utf-8"
-};
-
-} // unnamed namespace
-
-std::unique_ptr<Response> InternalServer::handle_catalog(const RequestContext& request)
-{
-  if (m_verbose.load()) {
-    printf("** running handle_catalog");
-  }
-
-  std::string host;
-  std::string url;
-  try {
-    host = request.get_header("Host");
-    url  = request.get_url_part(1);
-  } catch (const std::out_of_range&) {
-    return HTTP404Response(*this, request)
-           + urlNotFoundMsg;
-  }
-
-  if (url == "v2") {
-    return handle_catalog_v2(request);
-  }
-
-  if (url != "searchdescription.xml" && url != "root.xml" && url != "search") {
-    return HTTP404Response(*this, request)
-           + urlNotFoundMsg;
-  }
-
-  if (url == "searchdescription.xml") {
-    auto response = ContentResponse::build(*this, RESOURCE::opensearchdescription_xml, get_default_data(), "application/opensearchdescription+xml");
-    return std::move(response);
-  }
-
-  zim::Uuid uuid;
-  kiwix::OPDSDumper opdsDumper(mp_library.get(), mp_nameMapper.get());
-  opdsDumper.setRootLocation(m_root);
-  opdsDumper.setLibraryId(getLibraryId());
-  std::vector<std::string> bookIdsToDump;
-  if (url == "root.xml") {
-    uuid = zim::Uuid::generate(host);
-    bookIdsToDump = mp_library->filter(kiwix::Filter().valid(true).local(true).remote(true));
-  } else if (url == "search") {
-    bookIdsToDump = search_catalog(request, opdsDumper);
-    uuid = zim::Uuid::generate();
-  }
-
-  auto response = ContentResponse::build(
-      *this,
-      opdsDumper.dumpOPDSFeed(bookIdsToDump, request.get_query()),
-      opdsMimeType[OPDS_ACQUISITION_FEED]);
-  return std::move(response);
-}
-
 std::unique_ptr<Response> InternalServer::handle_catalog_v2(const RequestContext& request)
 {
  if (m_verbose.load()) {
@@ -158,13 +90,13 @@ std::unique_ptr<Response> InternalServer::handle_catalog_v2_root(const RequestCo
               {"category_list_feed_id", gen_uuid(libraryId + "/categories")},
               {"language_list_feed_id", gen_uuid(libraryId + "/languages")}
             },
-             opdsMimeType[OPDS_NAVIGATION_FEED]
+             "application/atom+xml;profile=opds-catalog;kind=navigation"
  );
 }

 std::unique_ptr<Response> InternalServer::handle_catalog_v2_entries(const RequestContext& request, bool partial)
 {
-  OPDSDumper opdsDumper(mp_library.get(), mp_nameMapper.get());
+  OPDSDumper opdsDumper(mp_library, mp_nameMapper);
  opdsDumper.setRootLocation(m_root);
  opdsDumper.setLibraryId(getLibraryId());
  const auto bookIds = search_catalog(request, opdsDumper);
@@ -172,7 +104,7 @@ std::unique_ptr<Response> InternalServer::handle_catalog_v2_entries(const Reques
  return ContentResponse::build(
             *this,
             opdsFeed,
-             opdsMimeType[OPDS_ACQUISITION_FEED]
+             "application/atom+xml;profile=opds-catalog;kind=acquisition"
  );
 }

@@ -185,38 +117,38 @@ std::unique_ptr<Response> InternalServer::handle_catalog_v2_complete_entry(const
           + urlNotFoundMsg;
  }

-  OPDSDumper opdsDumper(mp_library.get(), mp_nameMapper.get());
+  OPDSDumper opdsDumper(mp_library, mp_nameMapper);
  opdsDumper.setRootLocation(m_root);
  opdsDumper.setLibraryId(getLibraryId());
  const auto opdsFeed = opdsDumper.dumpOPDSCompleteEntry(entryId);
  return ContentResponse::build(
             *this,
             opdsFeed,
-             opdsMimeType[OPDS_ENTRY]
+             "application/atom+xml;type=entry;profile=opds-catalog"
  );
 }

 std::unique_ptr<Response> InternalServer::handle_catalog_v2_categories(const RequestContext& request)
 {
-  OPDSDumper opdsDumper(mp_library.get(), mp_nameMapper.get());
+  OPDSDumper opdsDumper(mp_library, mp_nameMapper);
  opdsDumper.setRootLocation(m_root);
  opdsDumper.setLibraryId(getLibraryId());
  return ContentResponse::build(
             *this,
             opdsDumper.categoriesOPDSFeed(),
-             opdsMimeType[OPDS_NAVIGATION_FEED]
+             "application/atom+xml;profile=opds-catalog;kind=navigation"
  );
 }

 std::unique_ptr<Response> InternalServer::handle_catalog_v2_languages(const RequestContext& request)
 {
-  OPDSDumper opdsDumper(mp_library.get(), mp_nameMapper.get());
+  OPDSDumper opdsDumper(mp_library, mp_nameMapper);
  opdsDumper.setRootLocation(m_root);
  opdsDumper.setLibraryId(getLibraryId());
  return ContentResponse::build(
             *this,
             opdsDumper.languagesOPDSFeed(),
-             opdsMimeType[OPDS_NAVIGATION_FEED]
+             "application/atom+xml;profile=opds-catalog;kind=navigation"
  );
 }

--- a/src/server/request_context.cpp
+++ b/src/server/request_context.cpp
@@ -49,15 +49,32 @@ RequestMethod str2RequestMethod(const std::string& method) {
  else                          return RequestMethod::OTHER;
 }

+std::string
+fullURL2LocalURL(const std::string& full_url, const std::string& rootLocation)
+{
+  if (rootLocation.empty()) {
+    // nothing special to handle.
+    return full_url;
+  } else if (full_url == rootLocation) {
+    return "/";
+  } else if (full_url.size() > rootLocation.size() &&
+             full_url.substr(0, rootLocation.size()+1) == rootLocation + "/") {
+    return full_url.substr(rootLocation.size());
+  } else {
+    return "";
+  }
+}
+
 } // unnamed namespace

 RequestContext::RequestContext(struct MHD_Connection* connection,
-                               const std::string& _rootLocation, // URI-encoded
-                               const std::string& unrootedUrl,   // URI-decoded
+                               std::string _rootLocation,
+                               const std::string& _url,
                               const std::string& _method,
                               const std::string& version) :
  rootLocation(_rootLocation),
-  url(unrootedUrl),
+  full_url(_url),
+  url(fullURL2LocalURL(_url, _rootLocation)),
  method(str2RequestMethod(_method)),
  version(version),
  requestIndex(s_requestIndex++),
@@ -136,6 +153,7 @@ void RequestContext::print_debug_info() const {
    printf("\n");
  }
  printf("Parsed : \n");
+  printf("full_url: %s\n", full_url.c_str());
  printf("url   : %s\n", url.c_str());
  printf("acceptEncodingGzip : %d\n", acceptEncodingGzip);
  printf("has_range : %d\n", byteRange_.kind() != ByteRange::NONE);
@@ -173,7 +191,7 @@ std::string RequestContext::get_url_part(int number) const {
 }

 std::string RequestContext::get_full_url() const {
-  return rootLocation + urlEncode(url);
+  return full_url;
 }

 std::string RequestContext::get_root_path() const {
@@ -181,7 +199,7 @@ std::string RequestContext::get_root_path() const {
 }

 bool RequestContext::is_valid_url() const {
-  return url.empty() || url[0] == '/';
+  return !url.empty();
 }

 ByteRange RequestContext::get_range() const {
@@ -202,12 +220,21 @@ std::string RequestContext::get_user_language() const
  return userlang.lang;
 }

+bool RequestContext::user_language_comes_from_cookie() const
+{
+  return userlang.selectedBy == UserLanguage::SelectorKind::COOKIE;
+}
+
 RequestContext::UserLanguage RequestContext::determine_user_language() const
 {
  try {
    return {UserLanguage::SelectorKind::QUERY_PARAM, get_argument("userlang")};
  } catch(const std::out_of_range&) {}

+  try {
+     return {UserLanguage::SelectorKind::COOKIE, cookies.at("userlang")};
+  } catch(const std::out_of_range&) {}
+
  try {
    const std::string acceptLanguage = get_header("Accept-Language");
    const auto userLangPrefs = parseUserLanguagePreferences(acceptLanguage);
--- a/src/server/request_context.h
+++ b/src/server/request_context.h
@@ -57,8 +57,8 @@ class IndexError: public std::runtime_error {};
 class RequestContext {
  public: // functions
    RequestContext(struct MHD_Connection* connection,
-                   const std::string& rootLocation, // URI-encoded
-                   const std::string& unrootedUrl,  // URI-decoded
+                   std::string rootLocation,
+                   const std::string& url,
                   const std::string& method,
                   const std::string& version);
    ~RequestContext();
@@ -96,16 +96,15 @@ class RequestContext {
    std::string get_query() const { return queryString; }

    template<class F>
-    std::string get_query(F filter, bool mustEncode) const {
+    std::string get_query(F filter) const {
      std::string q;
      const char* sep = "";
-      auto encode = [=](const std::string& value) { return mustEncode?urlEncode(value):value; };
      for ( const auto& a : arguments ) {
        if (!filter(a.first)) {
          continue;
        }
        for (const auto& v: a.second) {
-          q += sep + encode(a.first) + '=' + encode(v);
+          q += sep + urlEncode(a.first) + '=' + urlEncode(v);
          sep = "&";
        }
      }
@@ -119,12 +118,15 @@ class RequestContext {
    std::string get_user_language() const;
    std::string get_requested_format() const;

+    bool user_language_comes_from_cookie() const;
+
  private: // types
    struct UserLanguage
    {
      enum SelectorKind
      {
        QUERY_PARAM,
+        COOKIE,
        ACCEPT_LANGUAGE_HEADER,
        DEFAULT
      };
@@ -135,6 +137,7 @@ class RequestContext {

  private: // data
    std::string rootLocation;
+    std::string full_url;
    std::string url;
    RequestMethod method;
    std::string version;
--- a/src/server/response.cpp
+++ b/src/server/response.cpp
@@ -200,7 +200,7 @@ HTTP404Response::HTTP404Response(const InternalServer& server,

 HTTPErrorResponse& HTTP404Response::operator+(UrlNotFoundMsg /*unused*/)
 {
-  const std::string requestUrl = urlDecode(m_request.get_full_url(), false);
+  const std::string requestUrl = m_request.get_full_url();
  return *this + ParameterizedMessage("url-not-found", {{"url", requestUrl}});
 }

@@ -234,7 +234,7 @@ HTTP400Response::HTTP400Response(const InternalServer& server,

 HTTPErrorResponse& HTTP400Response::operator+(InvalidUrlMsg /*unused*/)
 {
-  std::string requestUrl = urlDecode(m_request.get_full_url(), false);
+  std::string requestUrl = m_request.get_full_url();
  const auto query = m_request.get_query();
  if (!query.empty()) {
    requestUrl += "?" + encodeDiples(query);
@@ -387,6 +387,13 @@ MHD_Result Response::send(const RequestContext& request, MHD_Connection* connect
    MHD_add_response_header(response, p.first.c_str(), p.second.c_str());
  }

+  if ( ! request.user_language_comes_from_cookie() ) {
+    const std::string cookie = "userlang=" + request.get_user_language()
+                               + ";Path=" + request.get_root_path()
+                               + ";Max-Age=31536000";
+    MHD_add_response_header(response, MHD_HTTP_HEADER_SET_COOKIE, cookie.c_str());
+  }
+
  if (m_returnCode == MHD_HTTP_OK && m_byteRange.kind() == ByteRange::RESOLVED_PARTIAL_CONTENT)
    m_returnCode = MHD_HTTP_PARTIAL_CONTENT;

--- a/src/tools/languageTools.cpp
+++ b/src/tools/languageTools.cpp
@@ -1,75 +0,0 @@
-#include "tools.h"
-#include "stringTools.h"
-#include <mutex>
-
-namespace kiwix
-{
-
-namespace
-{
-
-// These mappings are not provided by the ICU library, any such mappings can be manually added here
-std::map<std::string, std::string> iso639_3 = {
-    {"atj", "atikamekw"},
-    {"azb", "آذربایجان دیلی"},
-    {"bcl", "central bikol"},
-    {"bgs", "tagabawa"},
-    {"bxr", "буряад хэлэн"},
-    {"cbk", "chavacano"},
-    {"cdo", "閩東語"},
-    {"dag", "Dagbani"},
-    {"diq", "dimli"},
-    {"dty", "डोटेली"},
-    {"eml", "emiliân-rumagnōl"},
-    {"fbs", "српскохрватски"},
-    {"fon", "fɔ̀ngbè"},
-    {"guw", "Gungbe"},
-    {"hbs", "srpskohrvatski"},
-    {"ido", "ido"},
-    {"kbp", "kabɩyɛ"},
-    {"kld", "Gamilaraay"},
-    {"lbe", "лакку маз"},
-    {"lbj", "ལ་དྭགས་སྐད་"},
-    {"map", "Austronesian"},
-    {"mhr", "марий йылме"},
-    {"mnw", "ဘာသာမန်"},
-    {"myn", "mayan"},
-    {"nah", "nahuatl"},
-    {"nai", "north American Indian"},
-    {"nds", "plattdütsch"},
-    {"nrm", "bhasa narom"},
-    {"olo", "livvi"},
-    {"pih", "Pitcairn-Norfolk"},
-    {"pnb", "Western Panjabi"},
-    {"rmr", "Caló"},
-    {"rmy", "romani shib"},
-    {"roa", "romance languages"},
-    {"twi", "twi"},
-// ICU for Ubuntu versions <= focal (20.04) returns "" for the language code ""
-// unlike the later versions - which returns "und". We map this value to "Undetermined" for a common ground.
-    {"", "Undetermined"},
-};
-
-std::once_flag fillLanguagesFlag;
-
-void fillLanguagesMap()
-{
-    for (auto icuLangPtr = icu::Locale::getISOLanguages(); *icuLangPtr != NULL; ++icuLangPtr) {
-        const kiwix::ICULanguageInfo lang(*icuLangPtr);
-        iso639_3.insert({lang.iso3Code(), lang.selfName()});
-    }
-}
-
-} // unnamed namespace
-
-std::string getLanguageSelfName(const std::string& lang)
-{
-    std::call_once(fillLanguagesFlag, fillLanguagesMap);
-    const auto itr = iso639_3.find(lang);
-    if (itr != iso639_3.end()) {
-        return itr->second;
-    }
-    return lang;
-};
-
-} // namespace kiwix
--- a/src/tools/opdsParsingTools.cpp
+++ b/src/tools/opdsParsingTools.cpp
@@ -1,70 +0,0 @@
-#include "tools.h"
-#include <pugixml.hpp>
-
-namespace kiwix
-{
-
-namespace
-{
-#define VALUE(name) entryNode.child(name).child_value()
-FeedLanguages parseLanguages(const pugi::xml_document& doc)
-{
-    pugi::xml_node feedNode = doc.child("feed");
-    FeedLanguages langs;
-
-    for (pugi::xml_node entryNode = feedNode.child("entry"); entryNode;
-        entryNode = entryNode.next_sibling("entry")) {
-            auto title = VALUE("title");
-            auto code = VALUE("dc:language");
-            langs.push_back({code, title});
-    }
-
-    return langs;
-}
-
-FeedCategories parseCategories(const pugi::xml_document& doc)
-{
-    pugi::xml_node feedNode = doc.child("feed");
-    FeedCategories categories;
-
-    for (pugi::xml_node entryNode = feedNode.child("entry"); entryNode;
-        entryNode = entryNode.next_sibling("entry")) {
-            auto title = VALUE("title");
-            categories.push_back(title);
-    }
-
-    return categories;
-}
-
-} // unnamed namespace
-
-FeedLanguages readLanguagesFromFeed(const std::string& content)
-{
-    pugi::xml_document doc;
-    pugi::xml_parse_result result
-        = doc.load_buffer((void*)content.data(), content.size());
-
-    if (result) {
-        auto langs = parseLanguages(doc);
-        return langs;
-    }
-
-    return FeedLanguages();
-}
-
-FeedCategories readCategoriesFromFeed(const std::string& content)
-{
-    pugi::xml_document doc;
-    pugi::xml_parse_result result
-        = doc.load_buffer((void*)content.data(), content.size());
-
-    FeedCategories categories;
-    if (result) {
-        categories = parseCategories(doc);
-        return categories;
-    }
-
-    return categories;
-}
-
-} // namespace kiwix
--- a/src/tools/otherTools.cpp
+++ b/src/tools/otherTools.cpp
@@ -330,19 +330,17 @@ std::string kiwix::render_template(const std::string& template_str, kainjow::mus
 namespace
 {

-std::string escapeForJSON(const std::string& s)
+std::string escapeBackslashes(const std::string& s)
 {
-  std::ostringstream oss;
+  std::string es;
+  es.reserve(s.size());
  for (char c : s) {
    if ( c == '\\' ) {
-      oss << "\\\\";
-    } else if ( unsigned(c) < 0x20U ) {
-      oss << "\\u" << std::setw(4) << std::setfill('0') << unsigned(c);
-    } else {
-      oss << c;
+      es.push_back('\\');
    }
+    es.push_back(c);
  }
-  return oss.str();
+  return es;
 }

 std::string makeFulltextSearchSuggestion(const std::string& lang,
@@ -370,10 +368,10 @@ void kiwix::Suggestions::add(const zim::SuggestionItem& suggestion)
                          ? suggestion.getSnippet()
                          : suggestion.getTitle();

-  result.set("label", escapeForJSON(label));
-  result.set("value", escapeForJSON(suggestion.getTitle()));
+  result.set("label", escapeBackslashes(label));
+  result.set("value", escapeBackslashes(suggestion.getTitle()));
  result.set("kind", "path");
-  result.set("path", escapeForJSON(suggestion.getPath()));
+  result.set("path", escapeBackslashes(suggestion.getPath()));
  result.set("first", m_data.is_empty_list());
  m_data.push_back(result);
 }
@@ -383,8 +381,8 @@ void kiwix::Suggestions::addFTSearchSuggestion(const std::string& uiLang,
 {
  kainjow::mustache::data result;
  const std::string label = makeFulltextSearchSuggestion(uiLang, queryString);
-  result.set("label", escapeForJSON(label));
-  result.set("value", escapeForJSON(queryString + " "));
+  result.set("label", escapeBackslashes(label));
+  result.set("value", escapeBackslashes(queryString + " "));
  result.set("kind", "pattern");
  result.set("first", m_data.is_empty_list());
  m_data.push_back(result);
--- a/src/tools/pathTools.cpp
+++ b/src/tools/pathTools.cpp
@@ -493,14 +493,12 @@ static std::map<std::string, std::string> extMimeTypes = {
 { "jpeg", "image/jpeg"},
 { "jpg", "image/jpeg"},
 { "gif", "image/gif"},
- { "ico", "image/x-icon"},
 { "svg", "image/svg+xml"},
 { "txt", "text/plain"},
 { "xml", "text/xml"},
 { "pdf", "application/pdf"},
 { "ogg", "application/ogg"},
 { "js", "application/javascript"},
- { "json", "application/json"},
 { "css", "text/css"},
 { "otf", "application/vnd.ms-opentype"},
 { "ttf", "application/font-ttf"},
--- a/src/tools/stringTools.cpp
+++ b/src/tools/stringTools.cpp
@@ -208,6 +208,43 @@ bool isHarmlessUriChar(char c)
  return false;
 }

+bool mustBeUriEncodedFor(kiwix::URIComponentKind target, char c)
+{
+  if (isHarmlessUriChar(c))
+    return false;
+
+  switch (c) {
+  case '/': // There is no reason to encode the path separator in the general
+            // case. It must be encoded only in a path component when its
+            // semantics of a path separator has to be suppressed.
+            return false;
+
+  case '@': // In a relative URL of the form abc@def/xyz (with no / in abc)
+            // a non-encoded @ will make "abc" and "def" to be interpreted as
+            // username and host components, respectively
+            return target == kiwix::URIComponentKind::PATH;
+
+  case ':': // In a relative URL of the form abc:def/xyz (with no / in abc)
+            // a non-encoded : will make "abc" and "def" to be interpreted as
+            // host and port components, respectively
+            return target == kiwix::URIComponentKind::PATH;
+
+  case '?': // A non-encoded '?' acts as a separator between the path
+            // and query components
+            return target == kiwix::URIComponentKind::PATH;
+
+  case '&': return target == kiwix::URIComponentKind::QUERY;
+  case '=': return target == kiwix::URIComponentKind::QUERY;
+  case '+': return target == kiwix::URIComponentKind::QUERY;
+
+  case '#': // A non-encoded '#' in either path or query-component
+            // would mark the beginning of the fragment component
+            return true;
+  }
+
+  return true;
+}
+
 int hexToInt(char c) {
  switch (c) {
  case '0': return 0;
@@ -247,6 +284,26 @@ std::string kiwix::urlEncode(const std::string& value)
  return os.str();
 }

+namespace kiwix
+{
+
+std::string uriEncode(URIComponentKind target, const std::string& value)
+{
+  std::ostringstream os;
+  os << std::hex << std::uppercase;
+  for (const char c : value) {
+    if ( mustBeUriEncodedFor(target, c)  ) {
+      const unsigned int charVal = static_cast<unsigned char>(c);
+      os << '%' << std::setw(2) << std::setfill('0') << charVal;
+    } else {
+      os << c;
+    }
+  }
+  return os.str();
+}
+
+} // namespace kiwix
+
 std::string kiwix::urlDecode(const std::string& value, bool component)
 {
  std::ostringstream os;
@@ -415,17 +472,6 @@ bool kiwix::startsWith(const std::string& base, const std::string& start)
        && std::equal(start.begin(), start.end(), base.begin());
 }

-std::string kiwix::stripSuffix(const std::string& str, const std::string& suffix)
-{
-  if (str.size() > suffix.size()) {
-    const auto subStr = str.substr(str.size() - suffix.size(), str.size());
-    if (subStr == suffix) {
-      return str.substr(0, str.size() - suffix.size());
-    }
-  }
-  return str;
-}
-
 std::vector<std::string> kiwix::getTitleVariants(const std::string& title) {
  std::vector<std::string> variants;
  variants.push_back(title);
--- a/src/tools/stringTools.h
+++ b/src/tools/stringTools.h
@@ -31,6 +31,7 @@
 namespace kiwix
 {
 std::string beautifyInteger(uint64_t number);
+std::string beautifyFileSize(uint64_t number);
 void printStringInHexadecimal(const char* s);
 void printStringInHexadecimal(icu::UnicodeString s);
 void stringReplacement(std::string& str,
@@ -59,6 +60,17 @@ private:
 std::string urlEncode(const std::string& value);
 std::string urlDecode(const std::string& value, bool component = false);

+// Only URI components that are of interest to libkiwix
+// are included in the below enumeration type
+enum class URIComponentKind
+{
+  PATH,
+  QUERY
+};
+
+// Encode 'value' for usage in a URI componenet specified by 'target'
+std::string uriEncode(URIComponentKind target, const std::string& value);
+
 std::string join(const std::vector<std::string>& list, const std::string& sep);

 std::string ucAll(const std::string& word);
@@ -92,8 +104,6 @@ std::string extractFromString(const std::string& str);

 bool startsWith(const std::string& base, const std::string& start);

-std::string stripSuffix(const std::string& str, const std::string& suffix);
-
 std::vector<std::string> getTitleVariants(const std::string& title);
 } //namespace kiwix
 #endif
--- a/static/generate_i18n_resources_list.py
+++ b/static/generate_i18n_resources_list.py
@@ -17,41 +17,15 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.

 from pathlib import Path
-import json

 script_path = Path(__file__)

 resource_file = script_path.parent / "i18n_resources_list.txt"
-translation_dir = script_path.parent / "skin/i18n"
-language_list_relpath = "skin/languages.js"
+translation_dir = script_path.parent / "i18n"

-def get_translation_info(filepath):
-    lang_code = Path(filepath).stem
-    with open(filepath, 'r', encoding="utf-8") as f:
-        content = json.load(f)
-        lang_name = content.get("name")
-        return lang_code, lang_name
-
-language_list = []
 json_files = translation_dir.glob("*.json")
 with open(resource_file, 'w', encoding="utf-8") as f:
-    for i18n_file in sorted(translation_dir.glob("*.json")):
-        if i18n_file.name == "qqq.json":
+    for json in sorted(translation_dir.glob("*.json")):
+        if json.name == "qqq.json":
            continue
-        print("Processing", i18n_file.name)
-        if i18n_file.name != "test.json":
-            lang_code, lang_name = get_translation_info(i18n_file)
-            if lang_name:
-                language_list.append((lang_code, lang_name))
-            else:
-                print(f"Warning: missing 'name' in {i18n_file.name}")
-        f.write(str(i18n_file.relative_to(script_path.parent)) + '\n')
-
-language_list = [{name: code} for code, name in sorted(language_list)]
-language_list_jsobj_str = json.dumps(language_list,
-                                     indent=2,
-                                     ensure_ascii=False)
-print("Saving", language_list_relpath)
-fullpath = script_path.parent / language_list_relpath
-with open(fullpath, 'w', encoding="utf-8") as f:
-    f.write("const uiLanguages = " + language_list_jsobj_str)
+        f.write(str(json.relative_to(script_path.parent)) + '\n')
--- a/static/skin/i18n/ar.json
+++ b/static/skin/i18n/ar.json
--- a/static/skin/i18n/bn.json
+++ b/static/skin/i18n/bn.json
@@ -10,9 +10,5 @@
 	"500-page-heading": "অভ্যন্তরীণ সার্ভার ত্রুটি",
 	"library-button-text": "স্বাগত পাতায় চলুন",
 	"home-button-text": "'{{BOOK_TITLE}}'-এর প্রধান পাতায় চলুন",
-	"searchbox-tooltip": "'{{BOOK_TITLE}}' অনুসন্ধান করুন",
-	"search": "অনুসন্ধান",
-	"welcome-to-kiwix-server": "কিউইক্স সার্ভারে স্বাগতম",
-	"download-links-title": "বই ডাউনলোড করুন",
-	"preview-book": "প্রাকদর্শন"
+	"searchbox-tooltip": "'{{BOOK_TITLE}}' অনুসন্ধান করুন"
 }
--- a/static/skin/i18n/cs.json
+++ b/static/skin/i18n/cs.json
--- a/static/i18n/de.json
+++ b/static/i18n/de.json
@@ -0,0 +1,20 @@
+{
+	"@metadata": {
+		"authors": [
+			"Lucas Werkmeister",
+			"ThisCarthing"
+		]
+	},
+	"name": "Deutsch",
+	"random-article-failure": "Hoppla! Konnte keinen zufälligen Artikel auswählen :(",
+	"400-page-title": "Ungültige Anfrage",
+	"400-page-heading": "Ungültige Anfrage",
+	"404-page-title": "Inhalt nicht gefunden",
+	"404-page-heading": "Nicht gefunden",
+	"500-page-title": "Interner Server-Fehler",
+	"500-page-heading": "Interner Server-Fehler",
+	"library-button-text": "Zur Willkommensseite gehen",
+	"home-button-text": "Zur Hauptseite von '{{BOOK_TITLE}}' gehen",
+	"random-page-button-text": "Zu einer zufällig ausgewählten Seite gehen",
+	"searchbox-tooltip": "Nach '{{BOOK_TITLE}}' suchen"
+}
--- a/static/skin/i18n/en.json
+++ b/static/skin/i18n/en.json
@@ -28,27 +28,4 @@
 	, "random-page-button-text": "Go to a randomly selected page"
 	, "searchbox-tooltip": "Search '{{BOOK_TITLE}}'"
 	, "confusion-of-tongues": "Two or more books in different languages would participate in search, which may lead to confusing results."
-	, "welcome-page-overzealous-filter": "No result. Would you like to <a href=\"{{URL}}\">reset filter</a>?"
-	, "powered-by-kiwix-html": "Powered by&nbsp;<a href=\"https://kiwix.org\">Kiwix</a>"
-	, "search": "Search"
-	, "book-filtering-all-categories": "All categories"
-	, "book-filtering-all-languages": "All languages"
-	, "count-of-matching-books": "{{COUNT}} book(s)"
-	, "download": "Download"
-	, "direct-download-link-text": "Direct"
-	, "direct-download-alt-text": "direct download"
-	, "hash-download-link-text": "Sha256 hash"
-	, "hash-download-alt-text": "download hash"
-	, "magnet-link-text": "Magnet link"
-	, "magnet-alt-text": "download magnet"
-	, "torrent-download-link-text": "Torrent file"
-	, "torrent-download-alt-text": "download torrent"
-	, "library-opds-feed-all-entries": "Library OPDS Feed - All entries"
-	, "filter-by-tag": "Filter by tag \"{{TAG}}\""
-	, "stop-filtering-by-tag": "Stop filtering by tag \"{{TAG}}\""
-	, "library-opds-feed-parameterised": "Library OPDS Feed - entries matching {{#LANG}}\nLanguage: {{LANG}} {{/LANG}}{{#CATEGORY}}\nCategory: {{CATEGORY}} {{/CATEGORY}}{{#TAG}}\nTag: {{TAG}} {{/TAG}}{{#Q}}\nQuery: {{Q}} {{/Q}}"
-	, "welcome-to-kiwix-server": "Welcome to Kiwix Server"
-	, "download-links-heading": "Download links for <b><i>{{BOOK_TITLE}}</i></b>"
-	, "download-links-title": "Download book"
-	, "preview-book": "Preview"
 }
--- a/static/skin/i18n/fr.json
+++ b/static/skin/i18n/fr.json
@@ -2,12 +2,11 @@
 	"@metadata": {
 		"authors": [
 			"Gomoko",
-			"Stephane",
 			"Thibaut120094",
 			"Verdy p"
 		]
 	},
-	"name": "Français",
+	"name": "français",
 	"suggest-full-text-search": "contenant « {{{SEARCH_TERMS}}} »...",
 	"no-such-book": "Aucun livre avec ce nom : {{BOOK_NAME}}",
 	"too-many-books": "Trop de livres demandés ({{NB_BOOKS}}) alors que la limite est de {{LIMIT}}",
@@ -31,28 +30,5 @@
 	"home-button-text": "Aller à la page principale de « {{BOOK_TITLE}} »",
 	"random-page-button-text": "Aller à une page sélectionnée aléatoirement",
 	"searchbox-tooltip": "Rechercher « {{BOOK_TITLE}} »",
-	"confusion-of-tongues": "Deux livres ou plus dans des langues différentes participeraient à la recherche, ce qui pourrait conduire à des résultats confus.",
-	"welcome-page-overzealous-filter": "Aucun résultat. Souhaitez-vous <a href=\"{{URL}}\">réinitialiser le filtre</a> ?",
-	"powered-by-kiwix-html": "Propulsé par <a href=\"https://kiwix.org/\">Kiwix</a>",
-	"search": "Rechercher",
-	"book-filtering-all-categories": "Toutes les catégories",
-	"book-filtering-all-languages": "Toutes les langues",
-	"count-of-matching-books": "{{COUNT}} livre(s)",
-	"download": "Télécharger",
-	"direct-download-link-text": "Direct",
-	"direct-download-alt-text": "téléchargement direct",
-	"hash-download-link-text": "Hachage sha256",
-	"hash-download-alt-text": "télécharger le hachage",
-	"magnet-link-text": "Lien Magnet",
-	"magnet-alt-text": "télécharger le lien Magnet",
-	"torrent-download-link-text": "Fichier torrent",
-	"torrent-download-alt-text": "télécharger le torrent",
-	"library-opds-feed-all-entries": "Flux OPDS de la bibliothèque – Toutes les entrées",
-	"filter-by-tag": "Filtrer par la balise « {{TAG}} »",
-	"stop-filtering-by-tag": "Arrêter le filtrage par la balise « {{TAG}} »",
-	"library-opds-feed-parameterised": "Flux OPDS de la bibliothèque – Entrées correspondant à {{#LANG}} :\n ▪ Langue : {{LANG}} {{/LANG}}{{#CATEGORY}}\n ▪ Catégorie : {{CATEGORY}} {{/CATEGORY}}{{#TAG}}\n ▪ Étiquette : {{TAG}} {{/TAG}}{{#Q}}\n ▪ Requête : {{Q}} {{/Q}}",
-	"welcome-to-kiwix-server": "Bienvenue sur le Serveur Kiwix",
-	"download-links-heading": "Liens de téléchargement pour <b><i>{{BOOK_TITLE}}</i></b>",
-	"download-links-title": "Télécharger le livre",
-	"preview-book": "Aperçu"
+	"confusion-of-tongues": "Deux livres ou plus dans des langues différentes participeraient à la recherche, ce qui pourrait conduire à des résultats confus."
 }
--- a/static/skin/i18n/he.json
+++ b/static/skin/i18n/he.json
@@ -29,28 +29,5 @@
 	"home-button-text": "מעבר לדף הראשי של \"{{BOOK_TITLE}}\"",
 	"random-page-button-text": "מעבר לדף שנבחר אקראית",
 	"searchbox-tooltip": "חיפוש \"{{BOOK_TITLE}}\"",
-	"confusion-of-tongues": "שני ספרים או יותר בשפות שונות ישתתפו בחיפוש, מה שעלול להוביל לתוצאות מבלבלות.",
-	"welcome-page-overzealous-filter": "אין תוצאות. האם <a href=\"{{URL}}\">לאפס את המסנן</a>?",
-	"powered-by-kiwix-html": "מופעל על־ידי&nbsp;<a href=\"https://kiwix.org\">Kiwix</a>",
-	"search": "חיפוש",
-	"book-filtering-all-categories": "כל הקטגוריות",
-	"book-filtering-all-languages": "כל השפות",
-	"count-of-matching-books": "{{COUNT}} ספרים",
-	"download": "הורדה",
-	"direct-download-link-text": "ישירה",
-	"direct-download-alt-text": "הורדה ישירה",
-	"hash-download-link-text": "גיבוב Sha256",
-	"hash-download-alt-text": "הורדת גיבוב",
-	"magnet-link-text": "קישור Magnet",
-	"magnet-alt-text": "הורדת magnet",
-	"torrent-download-link-text": "קובץ טורנט",
-	"torrent-download-alt-text": "הורדת טורנט",
-	"library-opds-feed-all-entries": "הזנת ספריית OPDS - כל הרשומות",
-	"filter-by-tag": "סינון לפי התג \"{{TAG}}\"",
-	"stop-filtering-by-tag": "להפסיק סינון לפי התג \"{{TAG}}\"",
-	"library-opds-feed-parameterised": "הזנת ספריית OPDS - רשומות שתואמות ל{{#LANG}}\nשפה: {{LANG}} {{/LANG}}{{#CATEGORY}}\nקטגוריה: {{CATEGORY}} {{/CATEGORY}}{{#TAG}}\nתג: {{TAG}} {{/TAG}}{{#Q}}\nשאילתה: {{Q}} {{/Q}}",
-	"welcome-to-kiwix-server": "ברוך בואך לשרת קיוויקס",
-	"download-links-heading": "הורדת קישורים עבור <b><i>{{BOOK_TITLE}}</i></b>",
-	"download-links-title": "הורדת ספר",
-	"preview-book": "תצוגה מקדימה"
+	"confusion-of-tongues": "שני ספרים או יותר בשפות שונות ישתתפו בחיפוש, מה שעלול להוביל לתוצאות מבלבלות."
 }
--- a/static/skin/i18n/hy.json
+++ b/static/skin/i18n/hy.json
@@ -16,6 +16,5 @@
 	"library-button-text": "Գրադարանի էջ",
 	"home-button-text": "Դեպի '{{BOOK_TITLE}}'֊ի գլխավոր էջը",
 	"random-page-button-text": "Բացել պատահական էջ",
-	"searchbox-tooltip": "Որոնել '{{BOOK_TITLE}}'֊ում",
-	"book-filtering-all-categories": "Բոլոր կատեգորիաներ"
+	"searchbox-tooltip": "Որոնել '{{BOOK_TITLE}}'֊ում"
 }
--- a/static/skin/i18n/it.json
+++ b/static/skin/i18n/it.json
@@ -2,13 +2,12 @@
 	"@metadata": {
 		"authors": [
 			"Albano",
-			"Beta16",
-			"McDutchie"
+			"Beta16"
 		]
 	},
 	"name": "italiano",
 	"suggest-full-text-search": "contenente '{{{SEARCH_TERMS}}}'...",
-	"no-such-book": "Nessun libro con questo nome: {{BOOK_NAME}}",
+	"no-such-book": "Nessun libro del genere: {{BOOK_NAME}}",
 	"too-many-books": "Troppi libri richiesti ({{NB_BOOKS}}) dove il limite è {{LIMIT}}",
 	"no-book-found": "Nessun libro corrisponde ai criteri di selezione",
 	"url-not-found": "L'URL richiesto \"{{url}}\" non è stato trovato in questo server.",
@@ -24,11 +23,5 @@
 	"library-button-text": "Vai alla pagina di benvenuto",
 	"home-button-text": "Vai alla pagina principale di '{{BOOK_TITLE}}'",
 	"random-page-button-text": "Vai a una pagina selezionata casualmente",
-	"searchbox-tooltip": "Cerca '{{BOOK_TITLE}}'",
-	"book-filtering-all-categories": "Tutte le categorie",
-	"book-filtering-all-languages": "Tutte le lingue",
-	"count-of-matching-books": "{{COUNT}} libro/i",
-	"download": "Scarica",
-	"download-links-title": "Scarica libro",
-	"preview-book": "Anteprima"
+	"searchbox-tooltip": "Cerca '{{BOOK_TITLE}}'"
 }
--- a/static/i18n/ja.json
+++ b/static/i18n/ja.json
@@ -0,0 +1,18 @@
+{
+	"@metadata": {
+		"authors": [
+			"MathXplore"
+		]
+	},
+	"no-query": "クエリを指定していません。",
+	"400-page-title": "無効なリクエストです",
+	"400-page-heading": "無効なリクエストです",
+	"404-page-title": "コンテンツが見つかりませんでした",
+	"404-page-heading": "見つかりません",
+	"500-page-title": "内部サーバーエラー",
+	"500-page-heading": "内部サーバーエラー",
+	"fulltext-search-unavailable": "全文検索は利用できません",
+	"no-search-results": "このコンテンツでは全文検索エンジンが利用できません",
+	"library-button-text": "ウェルカムページに移動",
+	"random-page-button-text": "無作為に選ばれたページに移動する"
+}
--- a/static/skin/i18n/ko.json
+++ b/static/skin/i18n/ko.json
@@ -14,6 +14,5 @@
 	"500-page-title": "내부 서버 오류",
 	"500-page-heading": "내부 서버 오류",
 	"fulltext-search-unavailable": "전문 검색을 사용할 수 없습니다",
-	"random-page-button-text": "무작위로 선택된 문서로 이동",
-	"preview-book": "미리 보기"
+	"random-page-button-text": "무작위로 선택된 문서로 이동"
 }
--- a/static/skin/i18n/ku-latn.json
+++ b/static/skin/i18n/ku-latn.json
--- a/static/skin/i18n/mk.json
+++ b/static/skin/i18n/mk.json
@@ -1,8 +1,7 @@
 {
 	"@metadata": {
 		"authors": [
-			"Bjankuloski06",
-			"Kelson"
+			"Bjankuloski06"
 		]
 	},
 	"name": "македонски",
@@ -29,28 +28,5 @@
 	"home-button-text": "Оди на главната страница на „{{BOOK_TITLE}}“",
 	"random-page-button-text": "Оди на случајно избрана страница",
 	"searchbox-tooltip": "Пребарај го „{{BOOK_TITLE}}“",
-	"confusion-of-tongues": "Во пребарувањето ќе учествуваат две или повеќе книги на различни јазици, што може да довете до збунувачки исход.",
-	"welcome-page-overzealous-filter": "Нема исход. Дали би сакале да го <a href=\"{{URL}}\">поништите филтерот</a>?",
-	"powered-by-kiwix-html": "Овозможено од&nbsp;<a href=\"https://kiwix.org\">Кивикс</a>",
-	"search": "Пребарај",
-	"book-filtering-all-categories": "Сите категории",
-	"book-filtering-all-languages": "Сите јазици",
-	"count-of-matching-books": "{{COUNT}} книги",
-	"download": "Преземи",
-	"direct-download-link-text": "Непосредно",
-	"direct-download-alt-text": "непосредно преземање",
-	"hash-download-link-text": "Sha256-тараба",
-	"hash-download-alt-text": "преземи тараба",
-	"magnet-link-text": "Магнетна врска",
-	"magnet-alt-text": "преземи магнет",
-	"torrent-download-link-text": "Торентна податотека",
-	"torrent-download-alt-text": "преземи торент",
-	"library-opds-feed-all-entries": "Библиотечен тековник на OPDS — Сите ставки",
-	"filter-by-tag": "Филтрирај по ознаката „{{TAG}}“",
-	"stop-filtering-by-tag": "Запри филтрирање по ознаката „{{TAG}}“",
-	"library-opds-feed-parameterised": "Библиотечен тековник на OPDS — ставки што одговараат на {{#LANG}}\nЈазик: {{LANG}} {{/LANG}}{{#CATEGORY}}\nКатегорија: {{CATEGORY}} {{/CATEGORY}}{{#TAG}}\nОзнака: {{TAG}} {{/TAG}}{{#Q}}\nБарање: {{Q}} {{/Q}}",
-	"welcome-to-kiwix-server": "Добре дојдовте на Опслужувачот на Кивикс",
-	"download-links-heading": "Врски за преземање на <b><i>{{BOOK_TITLE}}</i></b>",
-	"download-links-title": "Преземи книга",
-	"preview-book": "Преглед"
+	"confusion-of-tongues": "Во пребарувањето ќе учествуваат две или повеќе книги на различни јазици, што може да довете до збунувачки исход."
 }
--- a/static/skin/i18n/nqo.json
+++ b/static/skin/i18n/nqo.json
@@ -1,7 +1,6 @@
 {
 	"@metadata": {
 		"authors": [
-			"Amire80",
 			"Lancine.kounfantoh.fofana"
 		]
 	},
@@ -28,23 +27,5 @@
 	"library-button-text": "ߕߊ߯ ߟߊ߬ߛߣߍ߬ߟߌ߫ ߞߐߜߍ ߞߊ߲߬",
 	"home-button-text": "ߕߊ߯ {{BOOK_TITLE}} ߓߏ߬ߟߏ߲߬ߘߊ ߞߐߜߍ ߞߊ߲߬",
 	"random-page-button-text": "ߕߊ߯ ߓߍ߲߬ߛߋ߲߬ߡߊ߬ ߞߐߜߍ߫ ߛߎߥߊ߲ߘߌߣߍ߲ ߠߎ߬ ߞߊ߲߬",
-	"searchbox-tooltip": "ߕߌߙߌ߲ߠߌ߲ {{BOOK_TITLE}}",
-	"confusion-of-tongues": "ߞߊ߬ߝߊ߫ ߝߌ߬ߟߊ߬ ߥߟߊ߫ ߦߙߌߞߊ ߞߊ߲߫ ߜߘߍ ߟߎ߬ ߘߐ߫߸ ߏ߬ ߟߎ߫ ߘߌߣߊ߬ ߕߘߍ߬ ߢߌߣߌ߲ߠߌ߲ ߘߐ߫߸ ߡߍ߲ ߠߎ߬ ߛߌ߫ ߞߣߐ߬ߝߟߌ ߟߊߘߏ߲߬ ߠߊ߫ ߞߐߝߟߌ ߘߐ߫.",
-	"welcome-page-overzealous-filter": "ߞߐߝߟߌ߫ ߕߴߦߋ߲߬. ߊ߬ ߝߐ߫ ߌ ߦߴߊ߬ ߝߍ߬ ߞߊ߬ <a href=\"{{URL}}\">ߛߍ߲ߛߍ߲ߟߊ߲ ߘߐߛߌ߰ ߕߎ߲߯</a>؟",
-	"search": "ߢߌߣߌ߲ߠߌ߲",
-	"book-filtering-all-categories": "ߦߌߟߡߊ ߟߎ߬ ߓߍ߯",
-	"book-filtering-all-languages": "ߞߊ߲ ߠߎ߬ ߓߍ߯",
-	"count-of-matching-books": "ߞߊ߬ߝߊ {{COUNT}}(ߟߎ߫)",
-	"download": "ߟߊ߬ߖߌ߰ߒ߬ߞߎ߲߬ߠߌ߲",
-	"direct-download-link-text": "ߒߕߋߟߋ߲ߡߊ߬",
-	"direct-download-alt-text": "ߟߊ߬ߖߌ߰ߒ߬ߞߎ߲߬ߠߌ߲߫ ߝߊ߲ߞߢߊ",
-	"hash-download-alt-text": "ߤߊߛ߭ ߟߊߖߌ߰ ߌ ߞߎ߲߬",
-	"magnet-link-text": "ߡߊߢߍߕ ߛߘߌ߬ߜߋ߲",
-	"magnet-alt-text": "ߡߊߢߍߕ ߟߊߖߌ߰ ߌ ߞߎ߲߬",
-	"torrent-download-link-text": "ߕߏߙߍ߲ߕ ߞߐߕߐ߮",
-	"torrent-download-alt-text": "ߕߏߙߍ߲ߕ ߟߊߖߌ߰ ߌ ߞߎ߲߬",
-	"welcome-to-kiwix-server": "ߌ ߣߌ߫ ߛߣߍ߫ ߞߥߌߞߛ ߡߊߛߐߟߊ߲ ߞߣߐ߫",
-	"download-links-heading": "<b><i>{{BOOK_TITLE}}</i></b> ߛߘߌ߬ߜߋ߲ ߠߊߖߌ߰ ߌ ߞߎ߲߬",
-	"download-links-title": "ߞߊ߬ߝߊ ߟߊߖߌ߰ ߌ ߞߎ߲߬",
-	"preview-book": "ߊ߬ ߘߐߜߍ߫ ߡߎߣߎ߲߬"
+	"searchbox-tooltip": "ߕߌߙߌ߲ߠߌ߲ {{BOOK_TITLE}}"
 }
--- a/static/skin/i18n/pl.json
+++ b/static/skin/i18n/pl.json
@@ -1,8 +1,7 @@
 {
 	"@metadata": {
 		"authors": [
-			"Strebski",
-			"WaldiSt"
+			"Strebski"
 		]
 	},
 	"name": "Polski",
@@ -24,8 +23,5 @@
 	"library-button-text": "Przejdź do strony powitalnej",
 	"home-button-text": "Przejdź do głównej strony '{{BOOK_TITLE}}'",
 	"random-page-button-text": "Przejdź do losowo wybranej strony",
-	"searchbox-tooltip": "Szukaj '{{BOOK_TITLE}}'",
-	"welcome-to-kiwix-server": "Witamy na serwerze Kiwix",
-	"download-links-title": "Pobierz książkę",
-	"preview-book": "Podgląd"
+	"searchbox-tooltip": "Szukaj '{{BOOK_TITLE}}'"
 }
--- a/static/skin/i18n/qqq.json
+++ b/static/skin/i18n/qqq.json
@@ -29,28 +29,5 @@
 	"library-button-text": "Tooltip of the button leading to the welcome page",
 	"home-button-text": "Tooltip of the button leading to the main page of a book",
 	"random-page-button-text": "Tooltip of the button opening a randomly selected page",
-	"searchbox-tooltip": "Tooltip displayed for the search box",
-	"welcome-page-overzealous-filter": "Text shown when book filtering on the welcome page produces zero results",
-	"powered-by-kiwix-html": "Link to Kiwix website",
-	"search": "A general search action (text displayed on search buttons or as aplaceholder in searchboxes)",
-	"book-filtering-all-categories": "Choosing this filter will disable filtering of books by category",
-	"book-filtering-all-languages": "Choosing this filter will disable filtering of books by language",
-	"count-of-matching-books": "Reporting the count of books matching the filter",
-	"download": "A general download action",
-	"direct-download-link-text": "Link text for a direct download",
-	"direct-download-alt-text": "Hint for a direct download icon",
-	"hash-download-link-text": "Link text for downloading the hash",
-	"hash-download-alt-text": "Hint for the icon of hash download",
-	"magnet-link-text": "Link text for a magnet link",
-	"magnet-alt-text": "Hint for the icon of a magnet link",
-	"torrent-download-link-text": "Link text for downloading the torrent file",
-	"torrent-download-alt-text": "Hint for the icon of torrent download",
-	"library-opds-feed-all-entries": "Hint for the library OPDS feed for all entries",
-	"filter-by-tag": "Hint for a link that would load results filtered by a single tag",
-	"stop-filtering-by-tag": "Tooltip for the button that cancels filtering by tag",
-	"library-opds-feed-parameterised": "Hint for the library OPDS feed for filtered entries",
-	"welcome-to-kiwix-server": "Title shown in browser's title bar/page tab",
-	"download-links-heading": "Heading for no-js download page",
-	"download-links-title": "Title for no-js download page",
-	"preview-book": "Tooltip of book-tile leading to the book"
+	"searchbox-tooltip": "Tooltip displayed for the search box"
 }
--- a/static/skin/i18n/ru.json
+++ b/static/skin/i18n/ru.json
@@ -4,9 +4,7 @@
 			"Fenixs-ru",
 			"Kareyac",
 			"Okras",
-			"Pacha Tchernof",
-			"Razno0",
-			"Smavrina"
+			"Pacha Tchernof"
 		]
 	},
 	"name": "русский",
@@ -33,24 +31,5 @@
 	"home-button-text": "Перейти на главную страницу '{{BOOK_TITLE}}'",
 	"random-page-button-text": "Перейти на случайно выбранную страницу",
 	"searchbox-tooltip": "Искать '{{BOOK_TITLE}}'",
-	"confusion-of-tongues": "В поиске будут участвовать две или более книг на разных языках, что может привести к запутанным результатам.",
-	"powered-by-kiwix-html": "При поддержке&nbsp;<a href=\"https://kiwix.org\">Kiwix</a>",
-	"search": "Найти",
-	"book-filtering-all-categories": "Все категории",
-	"book-filtering-all-languages": "Все языки",
-	"count-of-matching-books": "{{COUNT}} книг(и)",
-	"download": "Скачать",
-	"direct-download-alt-text": "прямая загрузка",
-	"hash-download-link-text": "Хэш Sha256",
-	"hash-download-alt-text": "скачать хэш",
-	"magnet-link-text": "Магнитная ссылка",
-	"torrent-download-link-text": "Торрент-файл",
-	"torrent-download-alt-text": "скачать торрент",
-	"library-opds-feed-all-entries": "Канал библиотеки OPDS – все записи",
-	"filter-by-tag": "Фильтровать по тегу \"{{TAG}}\"",
-	"stop-filtering-by-tag": "Прекратить фильтрацию по тегу \"{{TAG}}\"",
-	"welcome-to-kiwix-server": "Добро пожаловать на сервер Kiwix",
-	"download-links-heading": "Ссылки для скачивания <b><i>{{BOOK_TITLE}}</i></b>",
-	"download-links-title": "Скачать книгу",
-	"preview-book": "Предпросмотр"
+	"confusion-of-tongues": "В поиске будут участвовать две или более книг на разных языках, что может привести к запутанным результатам."
 }
--- a/static/skin/i18n/sc.json
+++ b/static/skin/i18n/sc.json
@@ -1,7 +1,6 @@
 {
 	"@metadata": {
 		"authors": [
-			"Kelson",
 			"L2212"
 		]
 	},
@@ -29,28 +28,5 @@
 	"home-button-text": "Bae a sa pàgina printzipale de '{{BOOK_TITLE}}'",
 	"random-page-button-text": "Bae a una pàgina seletzionada a manera casuale",
 	"searchbox-tooltip": "Chirca '{{BOOK_TITLE}}'",
-	"confusion-of-tongues": "Duos o prus libros in limbas diferentes diant pigare parte a sa chirca, cosa chi diat pòdere causare resurtados confusionosos.",
-	"welcome-page-overzealous-filter": "Perunu resurtadu. Boles <a href=\"{{URL}}\">resetare su filtru</a>?",
-	"powered-by-kiwix-html": "Alimentadu dae&nbsp;<a href=\"https://kiwix.org\">Kiwix</a>",
-	"search": "Chirca",
-	"book-filtering-all-categories": "Totu sas categorias",
-	"book-filtering-all-languages": "Totu sas limbas",
-	"count-of-matching-books": "{{COUNT}} libru/os",
-	"download": "Iscàrriga",
-	"direct-download-link-text": "Diretu",
-	"direct-download-alt-text": "iscarrigamentu diretu",
-	"hash-download-link-text": "Hash SHA256",
-	"hash-download-alt-text": "hash de s'iscarrigamentu",
-	"magnet-link-text": "Ligàmene Magnet",
-	"magnet-alt-text": "ligàmene \"magnet\" de iscarrigamentu",
-	"torrent-download-link-text": "Documentu Torrent",
-	"torrent-download-alt-text": "iscàrriga su torrent",
-	"library-opds-feed-all-entries": "Flussu OPDS de sa biblioteca – Totu sos elementos",
-	"filter-by-tag": "Filtra pro eticheta \"{{TAG}}\"",
-	"stop-filtering-by-tag": "Non filtres prus pro eticheta \"{{TAG}}\"",
-	"library-opds-feed-parameterised": "Flussu OPDS de sa biblioteca - elementos chi currispondet cun {{#LANG}}\nLimba: {{LANG}} {{/LANG}}{{#CATEGORY}}\nCategoria: {{CATEGORY}} {{/CATEGORY}}{{#TAG}}\nEticheta: {{TAG}} {{/TAG}}{{#Q}}\nChirca: {{Q}} {{/Q}}",
-	"welcome-to-kiwix-server": "Bene bènnidu a su serbidore de Kiwix",
-	"download-links-heading": "Ligàmenes de iscarrigamentu pro <b><i>{{BOOK_TITLE}}</i></b>",
-	"download-links-title": "Iscàrriga su libru",
-	"preview-book": "Antiprima"
+	"confusion-of-tongues": "Duos o prus libros in limbas diferentes diant pigare parte a sa chirca, cosa chi diat pòdere causare resurtados confusionosos."
 }
--- a/static/skin/i18n/sk.json
+++ b/static/skin/i18n/sk.json
--- a/static/skin/i18n/sl.json
+++ b/static/skin/i18n/sl.json
@@ -1,8 +1,7 @@
 {
 	"@metadata": {
 		"authors": [
-			"Eleassar",
-			"Kelson"
+			"Eleassar"
 		]
 	},
 	"name": "slovenščina",
@@ -16,7 +15,7 @@
 	"invalid-raw-data-type": "{{DATATYPE}} ni veljaven zahtevek za neobdelano vsebino.",
 	"no-value-for-arg": "Argument {{ARGUMENT}} nima določene nobene vrednosti",
 	"no-query": "Poizvedba ni podana.",
-	"raw-entry-not-found": "Ni mogoče najti vnosa {{ENTRY}} tipa {{DATATYPE}}",
+	"raw-entry-not-found": "Ni mogoče najti vnosa {{ENTRY}} vrste {{DATATYPE}}",
 	"400-page-title": "Neveljaven zahtevek",
 	"400-page-heading": "Neveljaven zahtevek",
 	"404-page-title": "Vsebine ni mogoče najti",
@@ -29,28 +28,5 @@
 	"home-button-text": "Pojdite na glavno stran »{{BOOK_TITLE}}«",
 	"random-page-button-text": "Pojdite na naključno izbrano stran",
 	"searchbox-tooltip": "Poiščite »{{BOOK_TITLE}}«",
-	"confusion-of-tongues": "V iskanju bi bili uporabljeni dve ali več knjig v različnih jezikih, kar lahko pripelje do nejasnih zadetkov.",
-	"welcome-page-overzealous-filter": "Ni zadetkov. Želite <a href=\"{{URL}}\">ponastaviti filter</a>?",
-	"powered-by-kiwix-html": "Omogoča <a href=\"https://kiwix.org\">Kiwix</a>",
-	"search": "Išči",
-	"book-filtering-all-categories": "Vse kategorije",
-	"book-filtering-all-languages": "Vsi jeziki",
-	"count-of-matching-books": "{{COUNT}} knjiga(i/e)",
-	"download": "Prenesi",
-	"direct-download-link-text": "Neposredno",
-	"direct-download-alt-text": "neposredni prenos",
-	"hash-download-link-text": "Zgoščena vrednost SHA256",
-	"hash-download-alt-text": "prenesi zgoščeno vrednost",
-	"magnet-link-text": "Magnetna povezava",
-	"magnet-alt-text": "prenesi magnet",
-	"torrent-download-link-text": "Torrent datoteka",
-	"torrent-download-alt-text": "prenesi torrent",
-	"library-opds-feed-all-entries": "Knjižnični vir OPDS – Vsi vnosi",
-	"filter-by-tag": "Filtriraj po oznaki »{{TAG}}«",
-	"stop-filtering-by-tag": "Ustavi filtriranje po oznaki »{{TAG}}«",
-	"library-opds-feed-parameterised": "Knjižnični vir OPDS – vnosi, ki se ujemajo z {{#LANG}}\nJezik: {{LANG}} {{/LANG}}{{#CATEGORY}}\nKategorija: {{CATEGORY}} {{/CATEGORY}} {{#TAG}}\nOznaka: {{TAG}} {{/TAG}}{{#Q}}\nPoizvedba: {{Q}} {{/Q}}",
-	"welcome-to-kiwix-server": "Pozdravljeni na strežniku Kiwix",
-	"download-links-heading": "Povezave za prenos za <b><i>{{BOOK_TITLE}}</i></b>",
-	"download-links-title": "Prenesi knjigo",
-	"preview-book": "Predogled"
+	"confusion-of-tongues": "V iskanju bi bili uporabljeni dve ali več knjig v različnih jezikih, kar lahko pripelje do nejasnih zadetkov."
 }
--- a/static/skin/i18n/sv.json
+++ b/static/skin/i18n/sv.json
@@ -30,28 +30,5 @@
 	"home-button-text": "Gå till huvudsidan för \"{{BOOK_TITLE}}\"",
 	"random-page-button-text": "Gå till en slumpmässigt utvald sida",
 	"searchbox-tooltip": "Sök efter \"{{BOOK_TITLE}}\"",
-	"confusion-of-tongues": "Två eller fler böcker på olika språk skulle delta i sökningen, vilket kan ge förvirrande resultat.",
-	"welcome-page-overzealous-filter": "Inga resultat. Vill du <a href=\"{{URL}}\">återställa filtret</a>?",
-	"powered-by-kiwix-html": "Drivs av&nbsp;<a href=\"https://kiwix.org\">Kiwix</a>",
-	"search": "Sök",
-	"book-filtering-all-categories": "Alla kategorier",
-	"book-filtering-all-languages": "Alla språk",
-	"count-of-matching-books": "{{COUNT}} böcker",
-	"download": "Ladda ned",
-	"direct-download-link-text": "Direkt",
-	"direct-download-alt-text": "direktnedladdning",
-	"hash-download-link-text": "Sha256-hash",
-	"hash-download-alt-text": "ladda ned hash",
-	"magnet-link-text": "Magnetlänk",
-	"magnet-alt-text": "ladda ned magnet",
-	"torrent-download-link-text": "Torrent-fil",
-	"torrent-download-alt-text": "ladda ned torrent",
-	"library-opds-feed-all-entries": "Library OPDS Feed - Alla poster",
-	"filter-by-tag": "Filtrera efter taggen \"{{TAG}}\"",
-	"stop-filtering-by-tag": "Sluta filtrera efter taggen \"{{TAG}}\"",
-	"library-opds-feed-parameterised": "Library OPDS Feed - poster som matchar {{#LANG}}\nSpråk: {{LANG}} {{/LANG}}{{#CATEGORY}}\nKategori: {{CATEGORY}} {{/CATEGORY}}{{#TAG}}\nTagg: {{TAG}} {{/TAG}}{{#Q}}\nFråga: {{Q}} {{/Q}}",
-	"welcome-to-kiwix-server": "Välkommen till Kiwix Server",
-	"download-links-heading": "Nedladdningslänkar för <b><i>{{BOOK_TITLE}}</i></b>",
-	"download-links-title": "Ladda ned bok",
-	"preview-book": "Förhandsgranska"
+	"confusion-of-tongues": "Två eller fler böcker på olika språk skulle delta i sökningen, vilket kan ge förvirrande resultat."
 }
--- a/static/i18n/test.json
+++ b/static/i18n/test.json
@@ -0,0 +1,20 @@
+{
+	"@metadata": {
+		"authors": [
+			"Kareyac"
+		]
+	},
+	"name": "Fake language for i18n testing"
+	, "suggest-full-text-search": "[I18N TESTING] cOnTaInInG '{{{SEARCH_TERMS}}}'..."
+	, "no-such-book": "[I18N TESTING] No such book: {{BOOK_NAME}}. Sorry."
+	, "url-not-found": "[I18N TESTING] URL not found: {{url}}"
+	, "suggest-search": "[I18N TESTING] Make a full text search for <a href=\"{{{SEARCH_URL}}}\">{{PATTERN}}</a>"
+	, "400-page-title": "[I18N TESTING] Invalid request ($400 fine must be paid)"
+	, "400-page-heading": "[I18N TESTING] -400 karma for an invalid request"
+	, "404-page-title": "[I18N TESTING] Not Found - Try Again"
+	, "404-page-heading": "[I18N TESTING] Content not found, but at least the server is alive"
+	, "library-button-text": "[I18N TESTING] Navigate to the welcome page"
+	, "home-button-text": "[I18N TESTING] Jump to the main page of '{{BOOK_TITLE}}'"
+	, "random-page-button-text": "[I18N TESTING] I am tired of determinism"
+	, "searchbox-tooltip": "[I18N TESTING] Let's search in '{{BOOK_TITLE}}'"
+}
--- a/static/skin/i18n/tr.json
+++ b/static/skin/i18n/tr.json
--- a/static/i18n/zh-hans.json
+++ b/static/i18n/zh-hans.json
@@ -0,0 +1,16 @@
+{
+	"@metadata": {
+		"authors": [
+			"GuoPC",
+			"StarrySky"
+		]
+	},
+	"name": "英语",
+	"no-query": "未提供查询。",
+	"400-page-title": "无效请求",
+	"400-page-heading": "无效请求",
+	"404-page-heading": "未找到",
+	"500-page-title": "内部服务器错误",
+	"500-page-heading": "内部服务器错误",
+	"library-button-text": "前往欢迎页面"
+}
--- a/static/skin/i18n/zh-hant.json
+++ b/static/skin/i18n/zh-hant.json
@@ -1,7 +1,6 @@
 {
 	"@metadata": {
 		"authors": [
-			"Kelson",
 			"Kly",
 			"Winston Sung"
 		]
@@ -30,28 +29,5 @@
 	"home-button-text": "前往「{{BOOK_TITLE}}」的首頁",
 	"random-page-button-text": "前往隨機選取頁面",
 	"searchbox-tooltip": "在{{BOOK_TITLE}}搜尋",
-	"confusion-of-tongues": "搜索裡有加入兩本或更多不同語言的書籍，這可能會導致混淆結果。",
-	"welcome-page-overzealous-filter": "沒有結果。您想要<a href=\"{{URL}}\">重新設定篩選</a>嗎？",
-	"powered-by-kiwix-html": "由 <a href=\"https://kiwix.org\">Kiwix</a> 提供技術支援",
-	"search": "搜尋",
-	"book-filtering-all-categories": "所有分類",
-	"book-filtering-all-languages": "所有語言",
-	"count-of-matching-books": "{{COUNT}} 本書籍",
-	"download": "下載",
-	"direct-download-link-text": "直接",
-	"direct-download-alt-text": "直接下載",
-	"hash-download-link-text": "Sha256 雜湊",
-	"hash-download-alt-text": "下載雜湊",
-	"magnet-link-text": "Magnet 連結",
-	"magnet-alt-text": "下載 magnet",
-	"torrent-download-link-text": "Torrent 檔案",
-	"torrent-download-alt-text": "下載 torrent",
-	"library-opds-feed-all-entries": "圖書館 OPDS 摘要 - 所有項目",
-	"filter-by-tag": "依標籤「{{TAG}}」篩選",
-	"stop-filtering-by-tag": "停止依標籤「{{TAG}}」篩選",
-	"library-opds-feed-parameterised": "圖書館 OPDS 摘要 - 項目符合 {{#LANG}}\n語言：{{LANG}} {{/LANG}}{{#CATEGORY}}\n分類：{{CATEGORY}} {{/CATEGORY}}{{#TAG}}\n標籤：{{TAG}} {{/TAG}}{{#Q}}\n查詢：{{Q}} {{/Q}}",
-	"welcome-to-kiwix-server": "歡迎來到 Kiwix 伺服器",
-	"download-links-heading": "下載<b><i>{{BOOK_TITLE}}</i></b>的連結",
-	"download-links-title": "下載書籍",
-	"preview-book": "預覽"
+	"confusion-of-tongues": "搜索裡有加入兩本或更多不同語言的書籍，這可能會導致混淆結果。"
 }
--- a/static/i18n_resources_list.txt
+++ b/static/i18n_resources_list.txt
@@ -1,37 +1,24 @@
-skin/i18n/ar.json
-skin/i18n/bn.json
-skin/i18n/cs.json
-skin/i18n/de.json
-skin/i18n/dga.json
-skin/i18n/el.json
-skin/i18n/en.json
-skin/i18n/es.json
-skin/i18n/fi.json
-skin/i18n/fr.json
-skin/i18n/he.json
-skin/i18n/hi.json
-skin/i18n/hy.json
-skin/i18n/ia.json
-skin/i18n/it.json
-skin/i18n/ja.json
-skin/i18n/ko.json
-skin/i18n/ku-latn.json
-skin/i18n/lb.json
-skin/i18n/mk.json
-skin/i18n/ms.json
-skin/i18n/nl.json
-skin/i18n/nqo.json
-skin/i18n/or.json
-skin/i18n/pl.json
-skin/i18n/ru.json
-skin/i18n/sc.json
-skin/i18n/sk.json
-skin/i18n/skr-arab.json
-skin/i18n/sl.json
-skin/i18n/sq.json
-skin/i18n/sv.json
-skin/i18n/te.json
-skin/i18n/test.json
-skin/i18n/tr.json
-skin/i18n/zh-hans.json
-skin/i18n/zh-hant.json
+i18n/ar.json
+i18n/bn.json
+i18n/cs.json
+i18n/de.json
+i18n/en.json
+i18n/fr.json
+i18n/he.json
+i18n/hy.json
+i18n/it.json
+i18n/ja.json
+i18n/ko.json
+i18n/ku-latn.json
+i18n/mk.json
+i18n/nqo.json
+i18n/pl.json
+i18n/ru.json
+i18n/sc.json
+i18n/sk.json
+i18n/sl.json
+i18n/sv.json
+i18n/test.json
+i18n/tr.json
+i18n/zh-hans.json
+i18n/zh-hant.json
--- a/static/meson.build
+++ b/static/meson.build
@@ -1,18 +1,8 @@
-if meson.version().version_compare('>=0.47.0')
-    resource_files = run_command(
-        res_manager,
-        '--list-all',
-        files('resources_list.txt'),
-        check: true
-    ).stdout().strip().split('\n')
-else
-    resource_files = run_command(
-        res_manager,
-        '--list-all',
-        files('resources_list.txt')
-    ).stdout().strip().split('\n')
-endif
-
+resource_files = run_command(res_manager,
+                    '--list-all',
+                    files('resources_list.txt'),
+                    check: true
+                 ).stdout().strip().split('\n')

 preprocessed_resources = custom_target('preprocessed_resource_files',
    input: 'resources_list.txt',
@@ -25,7 +15,7 @@ preprocessed_resources = custom_target('preprocessed_resource_files',
 )

 lib_resources = custom_target('resources',
-    input: [preprocessed_resources, 'i18n_resources_list.txt'],
+    input: preprocessed_resources,
    output: ['libkiwix-resources.cpp', 'libkiwix-resources.h'],
    command:[res_compiler,
             '--cxxfile', '@OUTPUT0@',
@@ -41,24 +31,12 @@ lib_resources = custom_target('resources',
 # i18n_resource_files = fs.read('i18n_resources_list.txt').strip().split('\n')
 # ```
 # once we move to meson >= 0.57.0
-
-if meson.version().version_compare('>=0.47.0')
-    i18n_resource_files = run_command(
-        find_program('python3'),
-        '-c',
-        'import sys; f=open(sys.argv[1]); print(f.read())',
-        files('i18n_resources_list.txt'),
-        check: true
-    ).stdout().strip().split('\n')
-else
-    i18n_resource_files = run_command(
-        find_program('python3'),
-        '-c',
-        'import sys; f=open(sys.argv[1]); print(f.read())',
-        files('i18n_resources_list.txt'),
-    ).stdout().strip().split('\n')
-endif
-
+i18n_resource_files = run_command(find_program('python3'),
+                                    '-c',
+                                    'import sys; f=open(sys.argv[1]); print(f.read())',
+                                    files('i18n_resources_list.txt'),
+                                    check: true
+                                 ).stdout().strip().split('\n')

 i18n_resources = custom_target('i18n_resources',
    input: i18n_resource_files,
--- a/static/resources_list.txt
+++ b/static/resources_list.txt
@@ -1,16 +1,13 @@
 skin/caret.png
 skin/bittorrent.png
 skin/magnet.png
-skin/feed.svg
-skin/langSelector.svg
 skin/download.png
 skin/hash.png
 skin/search-icon.svg
 skin/iso6391To3.js
 skin/isotope.pkgd.min.js
 skin/index.js
-skin/autoComplete/autoComplete.min.js
-skin/kiwix.css
+skin/autoComplete.min.js
 skin/taskbar.css
 skin/index.css
 skin/fonts/Poppins.ttf
@@ -18,9 +15,6 @@ skin/fonts/Roboto.ttf
 skin/search_results.css
 skin/blank.html
 skin/viewer.js
-skin/i18n.js
-skin/languages.js
-skin/mustache.min.js
 viewer.html
 templates/search_result.html
 templates/search_result.xml
@@ -38,12 +32,10 @@ templates/catalog_v2_categories.xml
 templates/catalog_v2_languages.xml
 templates/url_of_search_results_css
 templates/viewer_settings.js
-templates/no_js_library_page.html
-templates/no_js_download.html
 opensearchdescription.xml
 ft_opensearchdescription.xml
 catalog_v2_searchdescription.xml
-skin/autoComplete/css/autoComplete.css
+skin/css/autoComplete.css
 skin/favicon/android-chrome-192x192.png
 skin/favicon/android-chrome-512x512.png
 skin/favicon/apple-touch-icon.png
--- a/static/skin/autoComplete/autoComplete.min.js
+++ b/static/skin/autoComplete/autoComplete.min.js
--- a/static/skin/autoComplete/LICENSE
+++ b/static/skin/autoComplete/LICENSE
@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--- a/static/skin/autoComplete/autoComplete.js
+++ b/static/skin/autoComplete/autoComplete.js
@@ -1,654 +0,0 @@
-(function (global, factory) {
-  typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
-  typeof define === 'function' && define.amd ? define(factory) :
-  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, global.autoComplete = factory());
-}(this, (function () { 'use strict';
-
-  function ownKeys(object, enumerableOnly) {
-    var keys = Object.keys(object);
-
-    if (Object.getOwnPropertySymbols) {
-      var symbols = Object.getOwnPropertySymbols(object);
-
-      if (enumerableOnly) {
-        symbols = symbols.filter(function (sym) {
-          return Object.getOwnPropertyDescriptor(object, sym).enumerable;
-        });
-      }
-
-      keys.push.apply(keys, symbols);
-    }
-
-    return keys;
-  }
-
-  function _objectSpread2(target) {
-    for (var i = 1; i < arguments.length; i++) {
-      var source = arguments[i] != null ? arguments[i] : {};
-
-      if (i % 2) {
-        ownKeys(Object(source), true).forEach(function (key) {
-          _defineProperty(target, key, source[key]);
-        });
-      } else if (Object.getOwnPropertyDescriptors) {
-        Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
-      } else {
-        ownKeys(Object(source)).forEach(function (key) {
-          Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
-        });
-      }
-    }
-
-    return target;
-  }
-
-  function _typeof(obj) {
-    "@babel/helpers - typeof";
-
-    if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") {
-      _typeof = function (obj) {
-        return typeof obj;
-      };
-    } else {
-      _typeof = function (obj) {
-        return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
-      };
-    }
-
-    return _typeof(obj);
-  }
-
-  function _defineProperty(obj, key, value) {
-    if (key in obj) {
-      Object.defineProperty(obj, key, {
-        value: value,
-        enumerable: true,
-        configurable: true,
-        writable: true
-      });
-    } else {
-      obj[key] = value;
-    }
-
-    return obj;
-  }
-
-  function _toConsumableArray(arr) {
-    return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread();
-  }
-
-  function _arrayWithoutHoles(arr) {
-    if (Array.isArray(arr)) return _arrayLikeToArray(arr);
-  }
-
-  function _iterableToArray(iter) {
-    if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
-  }
-
-  function _unsupportedIterableToArray(o, minLen) {
-    if (!o) return;
-    if (typeof o === "string") return _arrayLikeToArray(o, minLen);
-    var n = Object.prototype.toString.call(o).slice(8, -1);
-    if (n === "Object" && o.constructor) n = o.constructor.name;
-    if (n === "Map" || n === "Set") return Array.from(o);
-    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
-  }
-
-  function _arrayLikeToArray(arr, len) {
-    if (len == null || len > arr.length) len = arr.length;
-
-    for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
-
-    return arr2;
-  }
-
-  function _nonIterableSpread() {
-    throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-  }
-
-  function _createForOfIteratorHelper(o, allowArrayLike) {
-    var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"];
-
-    if (!it) {
-      if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") {
-        if (it) o = it;
-        var i = 0;
-
-        var F = function () {};
-
-        return {
-          s: F,
-          n: function () {
-            if (i >= o.length) return {
-              done: true
-            };
-            return {
-              done: false,
-              value: o[i++]
-            };
-          },
-          e: function (e) {
-            throw e;
-          },
-          f: F
-        };
-      }
-
-      throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-    }
-
-    var normalCompletion = true,
-        didErr = false,
-        err;
-    return {
-      s: function () {
-        it = it.call(o);
-      },
-      n: function () {
-        var step = it.next();
-        normalCompletion = step.done;
-        return step;
-      },
-      e: function (e) {
-        didErr = true;
-        err = e;
-      },
-      f: function () {
-        try {
-          if (!normalCompletion && it.return != null) it.return();
-        } finally {
-          if (didErr) throw err;
-        }
-      }
-    };
-  }
-
-  var select$1 = function select(element) {
-    return typeof element === "string" ? document.querySelector(element) : element();
-  };
-  var create = function create(tag, options) {
-    var el = typeof tag === "string" ? document.createElement(tag) : tag;
-    for (var key in options) {
-      var val = options[key];
-      if (key === "inside") {
-        val.append(el);
-      } else if (key === "dest") {
-        select$1(val[0]).insertAdjacentElement(val[1], el);
-      } else if (key === "around") {
-        var ref = val;
-        ref.parentNode.insertBefore(el, ref);
-        el.append(ref);
-        if (ref.getAttribute("autofocus") != null) ref.focus();
-      } else if (key in el) {
-        el[key] = val;
-      } else {
-        el.setAttribute(key, val);
-      }
-    }
-    return el;
-  };
-  var getQuery = function getQuery(field) {
-    return field instanceof HTMLInputElement || field instanceof HTMLTextAreaElement ? field.value : field.innerHTML;
-  };
-  var format = function format(value, diacritics) {
-    value = value.toString().toLowerCase();
-    return diacritics ? value.normalize("NFD").replace(/[\u0300-\u036f]/g, "").normalize("NFC") : value;
-  };
-  var debounce = function debounce(callback, duration) {
-    var timer;
-    return function () {
-      clearTimeout(timer);
-      timer = setTimeout(function () {
-        return callback();
-      }, duration);
-    };
-  };
-  var checkTrigger = function checkTrigger(query, condition, threshold) {
-    return condition ? condition(query) : query.length >= threshold;
-  };
-  var mark = function mark(value, cls) {
-    return create("mark", _objectSpread2({
-      innerHTML: value
-    }, typeof cls === "string" && {
-      "class": cls
-    })).outerHTML;
-  };
-
-  var configure = (function (ctx) {
-    var name = ctx.name,
-        options = ctx.options,
-        resultsList = ctx.resultsList,
-        resultItem = ctx.resultItem;
-    for (var option in options) {
-      if (_typeof(options[option]) === "object") {
-        if (!ctx[option]) ctx[option] = {};
-        for (var subOption in options[option]) {
-          ctx[option][subOption] = options[option][subOption];
-        }
-      } else {
-        ctx[option] = options[option];
-      }
-    }
-    ctx.selector = ctx.selector || "#" + name;
-    resultsList.destination = resultsList.destination || ctx.selector;
-    resultsList.id = resultsList.id || name + "_list_" + ctx.id;
-    resultItem.id = resultItem.id || name + "_result";
-    ctx.input = select$1(ctx.selector);
-  });
-
-  var eventEmitter = (function (name, ctx) {
-    ctx.input.dispatchEvent(new CustomEvent(name, {
-      bubbles: true,
-      detail: ctx.feedback,
-      cancelable: true
-    }));
-  });
-
-  var search = (function (query, record, options) {
-    var _ref = options || {},
-        mode = _ref.mode,
-        diacritics = _ref.diacritics,
-        highlight = _ref.highlight;
-    var nRecord = format(record, diacritics);
-    record = record.toString();
-    query = format(query, diacritics);
-    if (mode === "loose") {
-      query = query.replace(/ /g, "");
-      var qLength = query.length;
-      var cursor = 0;
-      var match = Array.from(record).map(function (character, index) {
-        if (cursor < qLength && nRecord[index] === query[cursor]) {
-          character = highlight ? mark(character, highlight) : character;
-          cursor++;
-        }
-        return character;
-      }).join("");
-      if (cursor === qLength) return match;
-    } else {
-      var _match = nRecord.indexOf(query);
-      if (~_match) {
-        query = record.substring(_match, _match + query.length);
-        _match = highlight ? record.replace(query, mark(query, highlight)) : record;
-        return _match;
-      }
-    }
-  });
-
-  var getData = function getData(ctx, query) {
-    return new Promise(function ($return, $error) {
-      var data;
-      data = ctx.data;
-      if (data.cache && data.store) return $return();
-      return new Promise(function ($return, $error) {
-        if (typeof data.src === "function") {
-          return data.src(query).then($return, $error);
-        }
-        return $return(data.src);
-      }).then(function ($await_4) {
-        try {
-          ctx.feedback = data.store = $await_4;
-          eventEmitter("response", ctx);
-          return $return();
-        } catch ($boundEx) {
-          return $error($boundEx);
-        }
-      }, $error);
-    });
-  };
-  var findMatches = function findMatches(query, ctx) {
-    var data = ctx.data,
-        searchEngine = ctx.searchEngine;
-    var matches = [];
-    data.store.forEach(function (value, index) {
-      var find = function find(key) {
-        var record = key ? value[key] : value;
-        var match = typeof searchEngine === "function" ? searchEngine(query, record) : search(query, record, {
-          mode: searchEngine,
-          diacritics: ctx.diacritics,
-          highlight: ctx.resultItem.highlight
-        });
-        if (!match) return;
-        var result = {
-          match: match,
-          value: value
-        };
-        if (key) result.key = key;
-        matches.push(result);
-      };
-      if (data.keys) {
-        var _iterator = _createForOfIteratorHelper(data.keys),
-            _step;
-        try {
-          for (_iterator.s(); !(_step = _iterator.n()).done;) {
-            var key = _step.value;
-            find(key);
-          }
-        } catch (err) {
-          _iterator.e(err);
-        } finally {
-          _iterator.f();
-        }
-      } else {
-        find();
-      }
-    });
-    if (data.filter) matches = data.filter(matches);
-    var results = matches.slice(0, ctx.resultsList.maxResults);
-    ctx.feedback = {
-      query: query,
-      matches: matches,
-      results: results
-    };
-    eventEmitter("results", ctx);
-  };
-
-  var Expand = "aria-expanded";
-  var Active = "aria-activedescendant";
-  var Selected = "aria-selected";
-  var feedback = function feedback(ctx, index) {
-    ctx.feedback.selection = _objectSpread2({
-      index: index
-    }, ctx.feedback.results[index]);
-  };
-  var render = function render(ctx) {
-    var resultsList = ctx.resultsList,
-        list = ctx.list,
-        resultItem = ctx.resultItem,
-        feedback = ctx.feedback;
-    var matches = feedback.matches,
-        results = feedback.results;
-    ctx.cursor = -1;
-    list.innerHTML = "";
-    if (matches.length || resultsList.noResults) {
-      var fragment = new DocumentFragment();
-      results.forEach(function (result, index) {
-        var element = create(resultItem.tag, _objectSpread2({
-          id: "".concat(resultItem.id, "_").concat(index),
-          role: "option",
-          innerHTML: result.match,
-          inside: fragment
-        }, resultItem["class"] && {
-          "class": resultItem["class"]
-        }));
-        if (resultItem.element) resultItem.element(element, result);
-      });
-      list.append(fragment);
-      if (resultsList.element) resultsList.element(list, feedback);
-      open(ctx);
-    } else {
-      close(ctx);
-    }
-  };
-  var open = function open(ctx) {
-    if (ctx.isOpen) return;
-    (ctx.wrapper || ctx.input).setAttribute(Expand, true);
-    ctx.list.removeAttribute("hidden");
-    ctx.isOpen = true;
-    eventEmitter("open", ctx);
-  };
-  var close = function close(ctx) {
-    if (!ctx.isOpen) return;
-    (ctx.wrapper || ctx.input).setAttribute(Expand, false);
-    ctx.input.setAttribute(Active, "");
-    ctx.list.setAttribute("hidden", "");
-    ctx.isOpen = false;
-    eventEmitter("close", ctx);
-  };
-  var goTo = function goTo(index, ctx) {
-    var resultItem = ctx.resultItem;
-    var results = ctx.list.getElementsByTagName(resultItem.tag);
-    var cls = resultItem.selected ? resultItem.selected.split(" ") : false;
-    if (ctx.isOpen && results.length) {
-      var _results$index$classL;
-      var state = ctx.cursor;
-      if (index >= results.length) index = 0;
-      if (index < 0) index = results.length - 1;
-      ctx.cursor = index;
-      if (state > -1) {
-        var _results$state$classL;
-        results[state].removeAttribute(Selected);
-        if (cls) (_results$state$classL = results[state].classList).remove.apply(_results$state$classL, _toConsumableArray(cls));
-      }
-      results[index].setAttribute(Selected, true);
-      if (cls) (_results$index$classL = results[index].classList).add.apply(_results$index$classL, _toConsumableArray(cls));
-      ctx.input.setAttribute(Active, results[ctx.cursor].id);
-      ctx.list.scrollTop = results[index].offsetTop - ctx.list.clientHeight + results[index].clientHeight + 5;
-      ctx.feedback.cursor = ctx.cursor;
-      feedback(ctx, index);
-      eventEmitter("navigate", ctx);
-    }
-  };
-  var next = function next(ctx) {
-    goTo(ctx.cursor + 1, ctx);
-  };
-  var previous = function previous(ctx) {
-    goTo(ctx.cursor - 1, ctx);
-  };
-  var select = function select(ctx, event, index) {
-    index = index >= 0 ? index : ctx.cursor;
-    if (index < 0) return;
-    ctx.feedback.event = event;
-    feedback(ctx, index);
-    eventEmitter("selection", ctx);
-    close(ctx);
-  };
-  var click = function click(event, ctx) {
-    var itemTag = ctx.resultItem.tag.toUpperCase();
-    var items = Array.from(ctx.list.querySelectorAll(itemTag));
-    var item = event.target.closest(itemTag);
-    if (item && item.nodeName === itemTag) {
-      select(ctx, event, items.indexOf(item));
-    }
-  };
-  var navigate = function navigate(event, ctx) {
-    switch (event.keyCode) {
-      case 40:
-      case 38:
-        event.preventDefault();
-        event.keyCode === 40 ? next(ctx) : previous(ctx);
-        break;
-      case 13:
-        if (!ctx.submit) event.preventDefault();
-        if (ctx.cursor >= 0) select(ctx, event);
-        break;
-      case 9:
-        if (ctx.resultsList.tabSelect && ctx.cursor >= 0) select(ctx, event);
-        break;
-      case 27:
-        ctx.input.value = "";
-        close(ctx);
-        break;
-    }
-  };
-
-  function start (ctx, q) {
-    var _this = this;
-    return new Promise(function ($return, $error) {
-      var queryVal, condition;
-      queryVal = q || getQuery(ctx.input);
-      queryVal = ctx.query ? ctx.query(queryVal) : queryVal;
-      condition = checkTrigger(queryVal, ctx.trigger, ctx.threshold);
-      if (condition) {
-        return getData(ctx, queryVal).then(function ($await_2) {
-          try {
-            if (ctx.feedback instanceof Error) return $return();
-            findMatches(queryVal, ctx);
-            if (ctx.resultsList) render(ctx);
-            return $If_1.call(_this);
-          } catch ($boundEx) {
-            return $error($boundEx);
-          }
-        }, $error);
-      } else {
-        close(ctx);
-        return $If_1.call(_this);
-      }
-      function $If_1() {
-        return $return();
-      }
-    });
-  }
-
-  var eventsManager = function eventsManager(events, callback) {
-    for (var element in events) {
-      for (var event in events[element]) {
-        callback(element, event);
-      }
-    }
-  };
-  var addEvents = function addEvents(ctx) {
-    var events = ctx.events;
-    var run = debounce(function () {
-      return start(ctx);
-    }, ctx.debounce);
-    var publicEvents = ctx.events = _objectSpread2({
-      input: _objectSpread2({}, events && events.input)
-    }, ctx.resultsList && {
-      list: events ? _objectSpread2({}, events.list) : {}
-    });
-    var privateEvents = {
-      input: {
-        input: function input() {
-          run();
-        },
-        keydown: function keydown(event) {
-          navigate(event, ctx);
-        },
-        blur: function blur() {
-          close(ctx);
-        }
-      },
-      list: {
-        mousedown: function mousedown(event) {
-          event.preventDefault();
-        },
-        click: function click$1(event) {
-          click(event, ctx);
-        }
-      }
-    };
-    eventsManager(privateEvents, function (element, event) {
-      if (!ctx.resultsList && event !== "input") return;
-      if (publicEvents[element][event]) return;
-      publicEvents[element][event] = privateEvents[element][event];
-    });
-    eventsManager(publicEvents, function (element, event) {
-      ctx[element].addEventListener(event, publicEvents[element][event]);
-    });
-  };
-  var removeEvents = function removeEvents(ctx) {
-    eventsManager(ctx.events, function (element, event) {
-      ctx[element].removeEventListener(event, ctx.events[element][event]);
-    });
-  };
-
-  function init (ctx) {
-    var _this = this;
-    return new Promise(function ($return, $error) {
-      var placeHolder, resultsList, parentAttrs;
-      placeHolder = ctx.placeHolder;
-      resultsList = ctx.resultsList;
-      parentAttrs = {
-        role: "combobox",
-        "aria-owns": resultsList.id,
-        "aria-haspopup": true,
-        "aria-expanded": false
-      };
-      create(ctx.input, _objectSpread2(_objectSpread2({
-        "aria-controls": resultsList.id,
-        "aria-autocomplete": "both"
-      }, placeHolder && {
-        placeholder: placeHolder
-      }), !ctx.wrapper && _objectSpread2({}, parentAttrs)));
-      if (ctx.wrapper) ctx.wrapper = create("div", _objectSpread2({
-        around: ctx.input,
-        "class": ctx.name + "_wrapper"
-      }, parentAttrs));
-      if (resultsList) ctx.list = create(resultsList.tag, _objectSpread2({
-        dest: [resultsList.destination, resultsList.position],
-        id: resultsList.id,
-        role: "listbox",
-        hidden: "hidden"
-      }, resultsList["class"] && {
-        "class": resultsList["class"]
-      }));
-      addEvents(ctx);
-      if (ctx.data.cache) {
-        return getData(ctx).then(function ($await_2) {
-          try {
-            return $If_1.call(_this);
-          } catch ($boundEx) {
-            return $error($boundEx);
-          }
-        }, $error);
-      }
-      function $If_1() {
-        eventEmitter("init", ctx);
-        return $return();
-      }
-      return $If_1.call(_this);
-    });
-  }
-
-  function extend (autoComplete) {
-    var prototype = autoComplete.prototype;
-    prototype.init = function () {
-      init(this);
-    };
-    prototype.start = function (query) {
-      start(this, query);
-    };
-    prototype.unInit = function () {
-      if (this.wrapper) {
-        var parentNode = this.wrapper.parentNode;
-        parentNode.insertBefore(this.input, this.wrapper);
-        parentNode.removeChild(this.wrapper);
-      }
-      removeEvents(this);
-    };
-    prototype.open = function () {
-      open(this);
-    };
-    prototype.close = function () {
-      close(this);
-    };
-    prototype.goTo = function (index) {
-      goTo(index, this);
-    };
-    prototype.next = function () {
-      next(this);
-    };
-    prototype.previous = function () {
-      previous(this);
-    };
-    prototype.select = function (index) {
-      select(this, null, index);
-    };
-    prototype.search = function (query, record, options) {
-      return search(query, record, options);
-    };
-  }
-
-  function autoComplete(config) {
-    this.options = config;
-    this.id = autoComplete.instances = (autoComplete.instances || 0) + 1;
-    this.name = "autoComplete";
-    this.wrapper = 1;
-    this.threshold = 1;
-    this.debounce = 0;
-    this.resultsList = {
-      position: "afterend",
-      tag: "ul",
-      maxResults: 5
-    };
-    this.resultItem = {
-      tag: "li"
-    };
-    configure(this);
-    extend.call(this, autoComplete);
-    init(this);
-  }
-
-  return autoComplete;
-
-})));
--- a/static/skin/autoComplete/css/autoComplete.css
+++ b/static/skin/autoComplete/css/autoComplete.css
@@ -1,4 +1,3 @@
-/* Modified from https://github.com/TarekRaafat/autoComplete.js (version 10.2.6)*/
 .autoComplete_wrapper {
  display: inline-block;
  position: relative;
--- a/static/skin/favicon/favicon.ico
+++ b/static/skin/favicon/favicon.ico
--- a/static/skin/feed.png
+++ b/static/skin/feed.png
--- a/static/skin/feed.svg
+++ b/static/skin/feed.svg
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 27.3.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="uiLanguageSelectorButton" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
-	 x="0px" y="0px" viewBox="0 0 30 30" style="enable-background:new 0 0 30 30;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FFFFFF;}
-	.st1{fill:#CCCCCC;}
-	.st2{fill:#F78422;}
-</style>
-<g>
-	<path class="st0" d="M2.9,29.6c-1.4,0-2.6-1.1-2.6-2.6V2.9c0-1.4,1.1-2.6,2.6-2.6h24.1c1.4,0,2.6,1.1,2.6,2.6v24.1
-		c0,1.4-1.1,2.6-2.6,2.6H2.9z"/>
-	<path class="st1" d="M27.1,0.6c1.3,0,2.3,1,2.3,2.3v24.1c0,1.3-1,2.3-2.3,2.3H2.9c-1.3,0-2.3-1-2.3-2.3V2.9c0-1.3,1-2.3,2.3-2.3
-		H27.1 M27.1,0.1H2.9c-1.6,0-2.8,1.3-2.8,2.8v24.1c0,1.6,1.3,2.8,2.8,2.8h24.1c1.6,0,2.8-1.3,2.8-2.8V2.9
-		C29.9,1.4,28.6,0.1,27.1,0.1L27.1,0.1z"/>
-</g>
-<g>
-	<path class="st2" d="M18,24h-3c0-5.2-4.2-9.4-9.4-9.4v-3C12.4,11.6,18,17.2,18,24z"/>
-	<path class="st2" d="M24.5,24h-3c-0.1-8.7-7.2-15.9-16-15.9v-3C16,5.1,24.5,13.6,24.5,24z"/>
-	<circle class="st2" cx="8.1" cy="21.6" r="2.6"/>
-</g>
-</svg>
--- a/static/skin/i18n.js
+++ b/static/skin/i18n.js
@@ -1,147 +0,0 @@
-import mustache from '../skin/mustache.min.js?KIWIXCACHEID'
-
-const Translations = {
-  defaultLanguage: null,
-  currentLanguage: null,
-  promises: {},
-  data: {},
-
-  load: function(lang, asDefault=false) {
-    if ( asDefault ) {
-      this.defaultLanguage = lang;
-      this.loadTranslationsJSON(lang);
-    } else {
-      this.currentLanguage = lang;
-      if ( lang != this.defaultLanguage ) {
-        this.loadTranslationsJSON(lang);
-      }
-    }
-  },
-
-  loadTranslationsJSON: function(lang) {
-    if ( this.promises[lang] )
-      return;
-
-    const errorMsg = `Error loading translations for language '${lang}': `;
-    this.promises[lang] = fetch(`./skin/i18n/${lang}.json`).then(async (resp) => {
-      if ( resp.ok ) {
-        this.data[lang] = JSON.parse(await resp.text());
-      } else {
-        console.log(errorMsg + resp.statusText);
-      }
-    }).catch((err) => {
-      console.log(errorMsg + err);
-    });
-  },
-
-  whenReady: function(callback) {
-    const defaultLangPromise = this.promises[this.defaultLanguage];
-    const currentLangPromise = this.promises[this.currentLanguage];
-    Promise.all([defaultLangPromise, currentLangPromise]).then(callback);
-  },
-
-  get: function(msgId) {
-    const activeTranslation = this.data[this.currentLanguage];
-
-    const r = activeTranslation && activeTranslation[msgId];
-    if ( r )
-      return r;
-
-    const defaultMsgs = this.data[this.defaultLanguage];
-    if ( defaultMsgs )
-      return defaultMsgs[msgId];
-
-    throw "Translations are not loaded";
-  }
-}
-
-
-function $t(msgId, params={}) {
-  try {
-    const msgTemplate = Translations.get(msgId);
-    if ( ! msgTemplate ) {
-      return "Invalid message id: " + msgId;
-    }
-
-    return mustache.render(msgTemplate, params);
-  } catch (err) {
-    return "ERROR: " + err;
-  }
-}
-
-const DEFAULT_UI_LANGUAGE = 'en';
-
-Translations.load(DEFAULT_UI_LANGUAGE, /*asDefault=*/true);
-
-function getUserLanguage() {
-  return new URLSearchParams(window.location.search).get('userlang')
-      || window.localStorage.getItem('userlang')
-      || viewerSettings.defaultUserLanguage
-      || DEFAULT_UI_LANGUAGE;
-}
-
-function setUserLanguage(lang, callback) {
-  window.localStorage.setItem('userlang', lang);
-  Translations.load(lang);
-  Translations.whenReady(callback);
-}
-
-function createModalUILanguageSelector() {
-  document.body.insertAdjacentHTML('beforeend',
-    `<div id="uiLanguageSelector" class="modal-wrapper">
-      <div class="modal">
-        <div class="modal-heading">
-          <div class="modal-title">
-            <div>
-                Select UI language
-            </div>
-          </div>
-          <div onclick="window.modalUILanguageSelector.close()" class="modal-close-button">
-            <div>
-              <svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 14 14" fill="none">
-                  <path fill-rule="evenodd" clip-rule="evenodd" d="M13.7071 1.70711C14.0976 1.31658 14.0976
-                  0.683417 13.7071 0.292893C13.3166 -0.0976311 12.6834 -0.0976311 12.2929 0.292893L7 5.58579L1.70711
-                  0.292893C1.31658 -0.0976311 0.683417 -0.0976311 0.292893 0.292893C-0.0976311 0.683417
-                  -0.0976311 1.31658 0.292893 1.70711L5.58579 7L0.292893 12.2929C-0.0976311 12.6834
-                  -0.0976311 13.3166 0.292893 13.7071C0.683417 14.0976 1.31658 14.0976 1.70711 13.7071L7
-                  8.41421L12.2929 13.7071C12.6834 14.0976 13.3166 14.0976 13.7071 13.7071C14.0976 13.3166
-                  14.0976 12.6834 13.7071 12.2929L8.41421 7L13.7071 1.70711Z" fill="black" />
-              </svg>
-            </div>
-          </div>
-        </div>
-        <div class="modal-content">
-          <select id="ui_language"></select>
-        </div>
-      </div>
-    </div>`);
-
-  window.modalUILanguageSelector = {
-    show: () => {
-      document.getElementById('uiLanguageSelector').style.display = 'flex';
-    },
-
-    close: () => {
-      document.getElementById('uiLanguageSelector').style.display = 'none';
-    }
-  };
-}
-
-function initUILanguageSelector(activeLanguage, languageChangeCallback) {
-  if ( document.getElementById("ui_language") == null ) {
-    createModalUILanguageSelector();
-  }
-  const languageSelector = document.getElementById("ui_language");
-  for (const lang of uiLanguages ) {
-    const lang_name = Object.getOwnPropertyNames(lang)[0];
-    const lang_code = lang[lang_name];
-    const is_selected = lang_code == activeLanguage;
-    languageSelector.appendChild(new Option(lang_name, lang_code, is_selected, is_selected));
-  }
-  languageSelector.onchange = languageChangeCallback;
-}
-
-window.$t = $t;
-window.getUserLanguage = getUserLanguage;
-window.setUserLanguage = setUserLanguage;
-window.initUILanguageSelector = initUILanguageSelector;
--- a/static/skin/i18n/de.json
+++ b/static/skin/i18n/de.json
@@ -1,57 +0,0 @@
-{
-	"@metadata": {
-		"authors": [
-			"IMayBeABitShy",
-			"Lucas Werkmeister",
-			"ThisCarthing"
-		]
-	},
-	"name": "Deutsch",
-	"suggest-full-text-search": "enthält '{{{SEARCH_TERMS}}}'...",
-	"no-such-book": "Buch nicht gefunden: {{BOOK_NAME}}",
-	"too-many-books": "Zu viele Bücher angefragt ({{NB_BOOKS}}), die Beschränkung liegt bei {{LIMIT}}",
-	"no-book-found": "Keine Bücher entsprechen den Auswahlkriterien",
-	"url-not-found": "Die angeforderte URL \"{{url}}\" konnte auf diesem Server nicht gefunden werden.",
-	"suggest-search": "Führe eine Volltextsuche nach <a href=\"{{{SEARCH_URL}}}\">{{PATTERN}}</a> durch",
-	"random-article-failure": "Hoppla! Konnte keinen zufälligen Artikel auswählen :(",
-	"invalid-raw-data-type": "{{DATATYPE}} ist keine gültige Anfrage für unverarbeiteten Inhalt",
-	"no-value-for-arg": "Kein Wert für den Parameter {{ARGUMENT}} gegeben",
-	"no-query": "Keine Suchanfrage gegeben.",
-	"raw-entry-not-found": "Eintrag {{ENTRY}} des Typs {{DATATYPE}} konnte nicht gefunden werden.",
-	"400-page-title": "Ungültige Anfrage",
-	"400-page-heading": "Ungültige Anfrage",
-	"404-page-title": "Inhalt nicht gefunden",
-	"404-page-heading": "Nicht gefunden",
-	"500-page-title": "Interner Server-Fehler",
-	"500-page-heading": "Interner Server-Fehler",
-	"fulltext-search-unavailable": "Die Volltestsuche steht nicht zur Verfügung.",
-	"no-search-results": "Die Volltextsuche ist für diesen Inhalt nicht verfügbar.",
-	"library-button-text": "Zur Willkommensseite gehen",
-	"home-button-text": "Zur Hauptseite von '{{BOOK_TITLE}}' gehen",
-	"random-page-button-text": "Zu einer zufällig ausgewählten Seite gehen",
-	"searchbox-tooltip": "Nach '{{BOOK_TITLE}}' suchen",
-	"confusion-of-tongues": "Zwei oder mehr Bücher unterschiedlicher Sprachen werden durchsucht, was zu unübersichtlichen Ergebnissen führen kann.",
-	"welcome-page-overzealous-filter": "Keine Ergebnisse gefunden. Möchten Sie den <a href=\"{{URL}}\">Filter zurücksetzen</a>?",
-	"powered-by-kiwix-html": "Angetrieben durch &nbsp;<a href=\"https://kiwix.org\">Kiwix</a>",
-	"search": "Suchen",
-	"book-filtering-all-categories": "Alle Kategorien",
-	"book-filtering-all-languages": "Alle Sprachen",
-	"count-of-matching-books": "{{COUNT}} Bücher",
-	"download": "Herunterladen",
-	"direct-download-link-text": "Direkt",
-	"direct-download-alt-text": "direkt herunterladen",
-	"hash-download-link-text": "Sha256 Hash",
-	"hash-download-alt-text": "Hash herunterladen",
-	"magnet-link-text": "Magnet Link",
-	"magnet-alt-text": "Magnet Link herunterladen",
-	"torrent-download-link-text": "Torrent-Datei",
-	"torrent-download-alt-text": "Torrent herunterladen",
-	"library-opds-feed-all-entries": "ODPS Feed der Bibliothek - Alle Einträge",
-	"filter-by-tag": "Nach Tag \"{{TAG}}\" filtern",
-	"stop-filtering-by-tag": "Filterung nach Tag \"{{TAG}}\" aufheben",
-	"library-opds-feed-parameterised": "ODPS Feed der Bibliothek - Einträge mit {{#LANG}\nSprache {{LANG}} {{/LANG}}{{#CATEGORY}}\nKategorie: {{CATEGORY}} {{/CATEGORY}}{{#TAG}}\nTag: {{TAG}}{{/TAG}}{{#Q}}\nQuery: {{Q}} {{/Q}}",
-	"welcome-to-kiwix-server": "Wilkommen beim Kiwix Server",
-	"download-links-heading": "Download Links für <b><i>{{BOOK_TITLE}}</i></b>",
-	"download-links-title": "Buch herunterladen",
-	"preview-book": "Vorschau"
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Veloman Yunkan	cd9785fe85	Enter uriEncode()	2023-01-25 23:45:18 +04:00
Veloman Yunkan	b7a019469c	Unconditional URI-encoding in RequestContext::get_query<F>(F)	2023-01-25 23:41:52 +04:00