diff --git a/quickget b/quickget
index 540eef5..a17361b 100755
--- a/quickget
+++ b/quickget
@@ -1850,6 +1850,7 @@ function get_windows() {
     local ARCH="x64"
     local INDEX=0
     local LANG_CODE="en"
+    local LANG_EDITION=""
     local LATEST_WINDOWS_VERSION=""
     local WINDOWS_NAME=""
     local VERSION_ID=""
@@ -1861,19 +1862,18 @@ function get_windows() {
     local DOWNLOAD_ID=""
     local DOWNLOAD_URL=""
 
-    # Ignore the most recent Windows 10 release for now.
-    if [ "${RELEASE}" -eq 10 ]; then
-      INDEX=0
-    fi
+    LANG_EDITION="${1}"
 
-    if [ "${RELEASE}" -eq 11 ]; then
-      INDEX=0
-    fi
+    # Ignore the most recent Windows 10 release for now.
+    case ${RELEASE} in
+      10) INDEX=0;;
+      11) INDEX=0;;
+    esac
 
     echo "Getting Windows ${RELEASE} URL..."
     WINDOWS_VERSIONS=$(wget -q -O- "https://tb.rg-adguard.net/php/get_version.php?type_id=1" | jq '.versions | sort_by(-(.version_id | tonumber))')
     dbg_windows "${WINDOWS_VERSIONS}"
-    LATEST_WINDOWS_VERSION=$(echo "${WINDOWS_VERSIONS}" | jq -c 'map(select(.name | contains("Windows '${RELEASE}'")))['${INDEX}']')
+    LATEST_WINDOWS_VERSION=$(echo "${WINDOWS_VERSIONS}" | jq -c 'map(select(.name | contains("Windows '"${RELEASE}"'")))['${INDEX}']')
     dbg_windows "${LATEST_WINDOWS_VERSION}"
 
     WINDOWS_NAME=$(echo "${LATEST_WINDOWS_VERSION}" | jq -r .name)
@@ -1883,11 +1883,11 @@ function get_windows() {
 
     case ${RELEASE} in
         8) EDITION_ID=$(wget -q -O- "https://tb.rg-adguard.net/php/get_edition.php?version_id=${VERSION_ID}&lang=name_${LANG_CODE}" | jq -r '.editions[] | select(.name_'${LANG_CODE}'=="Windows 8.1 Pro + Core").edition_id');;
-        10|11) EDITION_ID=$(wget -q -O- "https://tb.rg-adguard.net/php/get_edition.php?version_id=${VERSION_ID}&lang=name_${LANG_CODE}" | jq -r '.editions[] | select(.name_'${LANG_CODE}'=="Windows '${RELEASE}'").edition_id');;
+        10|11) EDITION_ID=$(wget -q -O- "https://tb.rg-adguard.net/php/get_edition.php?version_id=${VERSION_ID}&lang=name_${LANG_CODE}" | jq -r '.editions[] | select(.name_'${LANG_CODE}'=="Windows '"${RELEASE}"'").edition_id');;
     esac
     dbg_windows "${EDITION_ID}"
 
-    LANGUAGE_ID=$(wget -q -O- "https://tb.rg-adguard.net/php/get_language.php?edition_id=${EDITION_ID}&lang=name_${LANG_CODE}" | jq -r '.languages[] | select(.name_'${LANG_CODE}'=="'"${LANG_NAME}"'").language_id')
+    LANGUAGE_ID=$(wget -q -O- "https://tb.rg-adguard.net/php/get_language.php?edition_id=${EDITION_ID}&lang=name_${LANG_CODE}" | jq -r '.languages[] | select(.name_'${LANG_CODE}'=="'"${LANG_EDITION}"'").language_id')
     dbg_windows "${LANGUAGE_ID}"
     ARCH_INFO=$(wget -q -O- "https://tb.rg-adguard.net/php/get_arch.php?language_id=${LANGUAGE_ID}")
     dbg_windows "${ARCH_INFO}"
@@ -2005,7 +2005,7 @@ if [ -n "${2}" ]; then
     elif [ "${OS}" == "windows" ]; then
         LANG="English International"
         if [ -n "${3}" ]; then
-            EDITION="${3}"
+            LANG="${3}"
             if [[ ! ${LANGS[*]} =~ "${LANG}" ]]; then
                 echo -e "ERROR! ${LANG} is not a supported Windows language:\n"
                 for LANG in "${LANGS[@]}"; do