diff --git a/java/res/xml/rows_bepo.xml b/java/res/xml/rows_bepo.xml
index 6e97fea37..a021abe6e 100644
--- a/java/res/xml/rows_bepo.xml
+++ b/java/res/xml/rows_bepo.xml
@@ -18,6 +18,7 @@
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
+    <include latin:keyboardLayout="@xml/row_number_switch" />
     <Row
         latin:keyWidth="10%p"
     >
diff --git a/java/src/org/futo/inputmethod/latin/uix/settings/pages/AddLanguage.kt b/java/src/org/futo/inputmethod/latin/uix/settings/pages/AddLanguage.kt
index 917ce30e1..5431672a0 100644
--- a/java/src/org/futo/inputmethod/latin/uix/settings/pages/AddLanguage.kt
+++ b/java/src/org/futo/inputmethod/latin/uix/settings/pages/AddLanguage.kt
@@ -103,7 +103,7 @@ val LocaleLayoutMap = mapOf(
     "uz_UZ"  to   listOf("uzbek"),
     "vi"     to   listOf("qwerty"),
     "zu"     to   listOf("qwerty"),
-    "zz"     to   listOf("qwerty"),
+    "zz"     to   QwertyVariants,
 )
 
 @Preview