diff --git a/java/res/xml/method.xml b/java/res/xml/method.xml
index d6ded66..7a21a85 100644
--- a/java/res/xml/method.xml
+++ b/java/res/xml/method.xml
@@ -27,7 +27,7 @@
     cs: Czech/qwertz
     da: Danish/nordic
     de: German/qwertz
-    de_ZZ: German (QWERTY)/qwerty
+    de_QY: German (QWERTY)/qwerty
     el: Greek/greek
     en_US: English United States/qwerty
     en_GB: English Great Britain/qwerty
@@ -63,6 +63,7 @@
     tr: Turkish/qwerty
     uk: Ukrainian/east_slavic
     vi: Vietnamese/qwerty
+    zz_QY: QWERTY/qwerty
     -->
 <!-- TODO: use <lang>_keyboard icon instead of a common keyboard icon. -->
 <!-- If IME doesn't have an applicable subtype, the first subtype will be used as a default
@@ -74,7 +75,7 @@
             android:label="@string/subtype_en_US"
             android:imeSubtypeLocale="en_US"
             android:imeSubtypeMode="keyboard"
-            android:imeSubtypeExtraValue="TrySuppressingImeSwitcher,AsciiCapable,EnabledWhenDefaultIsNotAsciiCapable"
+            android:imeSubtypeExtraValue="TrySuppressingImeSwitcher,AsciiCapable"
     />
     <subtype android:icon="@drawable/ic_subtype_keyboard"
             android:label="@string/subtype_en_GB"
@@ -119,7 +120,7 @@
             android:label="@string/subtype_generic_qwerty"
             android:imeSubtypeLocale="de"
             android:imeSubtypeMode="keyboard"
-            android:imeSubtypeExtraValue="AsciiCapable,KeyboardLocale=de_ZZ"
+            android:imeSubtypeExtraValue="AsciiCapable,KeyboardLocale=de_QY"
     />
     <subtype android:icon="@drawable/ic_subtype_keyboard"
             android:label="@string/subtype_generic"
@@ -310,4 +311,10 @@
             android:imeSubtypeMode="keyboard"
             android:imeSubtypeExtraValue="AsciiCapable"
     />
+    <subtype android:icon="@drawable/ic_subtype_keyboard"
+            android:label="@string/subtype_qwerty"
+            android:imeSubtypeLocale="zz_QY"
+            android:imeSubtypeMode="keyboard"
+            android:imeSubtypeExtraValue="AsciiCapable,EnabledWhenDefaultIsNotAsciiCapable"
+    />
 </input-method>
diff --git a/java/res/xml/rowkeys_azerty2.xml b/java/res/xml/rowkeys_azerty2.xml
index 11bcd67..ff0b062 100644
--- a/java/res/xml/rowkeys_azerty2.xml
+++ b/java/res/xml/rowkeys_azerty2.xml
@@ -35,9 +35,11 @@
         latin:keyLabel="g"
         latin:moreKeys="@string/more_keys_for_g" />
     <Key
-        latin:keyLabel="h" />
+        latin:keyLabel="h"
+        latin:moreKeys="@string/more_keys_for_h" />
     <Key
-        latin:keyLabel="j" />
+        latin:keyLabel="j"
+        latin:moreKeys="@string/more_keys_for_j" />
     <Key
         latin:keyLabel="k"
         latin:moreKeys="@string/more_keys_for_k" />
diff --git a/java/res/xml/rowkeys_azerty3.xml b/java/res/xml/rowkeys_azerty3.xml
index 1a0eacc..b81c3c5 100644
--- a/java/res/xml/rowkeys_azerty3.xml
+++ b/java/res/xml/rowkeys_azerty3.xml
@@ -22,7 +22,8 @@
     xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
 >
     <Key
-        latin:keyLabel="w" />
+        latin:keyLabel="w"
+        latin:moreKeys="@string/more_keys_for_w" />
     <Key
         latin:keyLabel="x" />
     <Key
diff --git a/java/res/xml/rowkeys_qwerty1.xml b/java/res/xml/rowkeys_qwerty1.xml
index bd5e9a2..19067a7 100644
--- a/java/res/xml/rowkeys_qwerty1.xml
+++ b/java/res/xml/rowkeys_qwerty1.xml
@@ -28,7 +28,8 @@
     <Key
         latin:keyLabel="w"
         latin:keyHintLabel="2"
-        latin:additionalMoreKeys="2" />
+        latin:additionalMoreKeys="2"
+        latin:moreKeys="@string/more_keys_for_w" />
     <Key
         latin:keyLabel="e"
         latin:keyHintLabel="3"
diff --git a/java/res/xml/rowkeys_qwerty2.xml b/java/res/xml/rowkeys_qwerty2.xml
index 4c983df..2fa8214 100644
--- a/java/res/xml/rowkeys_qwerty2.xml
+++ b/java/res/xml/rowkeys_qwerty2.xml
@@ -36,9 +36,11 @@
         latin:keyLabel="g"
         latin:moreKeys="@string/more_keys_for_g" />
     <Key
-        latin:keyLabel="h" />
+        latin:keyLabel="h"
+        latin:moreKeys="@string/more_keys_for_h" />
     <Key
-        latin:keyLabel="j" />
+        latin:keyLabel="j"
+        latin:moreKeys="@string/more_keys_for_j" />
     <Key
         latin:keyLabel="k"
         latin:moreKeys="@string/more_keys_for_k" />
diff --git a/java/res/xml/rowkeys_qwertz1.xml b/java/res/xml/rowkeys_qwertz1.xml
index 27b8a76..3e11a7a 100644
--- a/java/res/xml/rowkeys_qwertz1.xml
+++ b/java/res/xml/rowkeys_qwertz1.xml
@@ -28,7 +28,8 @@
     <Key
         latin:keyLabel="w"
         latin:keyHintLabel="2"
-        latin:additionalMoreKeys="2" />
+        latin:additionalMoreKeys="2"
+        latin:moreKeys="@string/more_keys_for_w" />
     <Key
         latin:keyLabel="e"
         latin:keyHintLabel="3"