diff --git a/app/src/main/res/xml/rowkeys_bepo2.xml b/app/src/main/res/xml/rowkeys_bepo2.xml
index 360a0c8b1..20141b064 100644
--- a/app/src/main/res/xml/rowkeys_bepo2.xml
+++ b/app/src/main/res/xml/rowkeys_bepo2.xml
@@ -18,30 +18,48 @@
 >
     <Key
         latin:keySpec="a"
+        latin:keyHintLabel="\@"
+        latin:additionalMoreKeys="\\@"
         latin:moreKeys="!text/morekeys_a" />
     <Key
         latin:keySpec="u"
+        latin:keyHintLabel="#"
+        latin:additionalMoreKeys="#"
         latin:moreKeys="!text/morekeys_u" />
     <Key
         latin:keySpec="i"
+        latin:keyHintLabel="$"
+        latin:additionalMoreKeys="$"
         latin:moreKeys="!text/morekeys_i" />
     <Key
         latin:keySpec="e"
+        latin:keyHintLabel="%"
+        latin:additionalMoreKeys="%"
         latin:moreKeys="!text/morekeys_e" />
     <Key
         latin:keySpec="c"
+        latin:keyHintLabel="&amp;"
+        latin:additionalMoreKeys="&amp;"
         latin:moreKeys="!text/morekeys_c" />
     <Key
         latin:keySpec="t"
+        latin:keyHintLabel="-"
+        latin:additionalMoreKeys="-"
         latin:moreKeys="!text/morekeys_t" />
     <Key
         latin:keySpec="s"
+        latin:keyHintLabel="+"
+        latin:additionalMoreKeys="+"
         latin:moreKeys="!text/morekeys_s" />
     <Key
         latin:keySpec="r"
+        latin:keyHintLabel="("
+        latin:additionalMoreKeys="("
         latin:moreKeys="!text/morekeys_r" />
     <Key
         latin:keySpec="n"
+        latin:keyHintLabel=")"
+        latin:additionalMoreKeys=")"
         latin:moreKeys="!text/morekeys_n" />
     <Key
         latin:keySpec="m" />
diff --git a/app/src/main/res/xml/rowkeys_bepo3.xml b/app/src/main/res/xml/rowkeys_bepo3.xml
index a449c62e0..0fd6cd84b 100644
--- a/app/src/main/res/xml/rowkeys_bepo3.xml
+++ b/app/src/main/res/xml/rowkeys_bepo3.xml
@@ -18,21 +18,35 @@
 >
     <Key
         latin:keySpec="y"
+        latin:keyHintLabel="*"
+        latin:additionalMoreKeys="*"
         latin:moreKeys="!text/morekeys_y" />
     <Key
-        latin:keySpec="x" />
+        latin:keySpec="x"
+        latin:keyHintLabel="&quot;"
+        latin:additionalMoreKeys="&quot;" />
     <Key
         latin:keySpec="k"
+        latin:keyHintLabel="&apos;"
+        latin:additionalMoreKeys="&apos;"
         latin:moreKeys="!text/morekeys_k" />
     <Key
         latin:keySpec="q"
+        latin:keyHintLabel=":"
+        latin:additionalMoreKeys=":"
         latin:moreKeys="!text/morekeys_q" />
     <Key
         latin:keySpec="g"
+        latin:keyHintLabel=";"
+        latin:additionalMoreKeys=";"
         latin:moreKeys="!text/morekeys_g" />
     <Key
         latin:keySpec="h"
+        latin:keyHintLabel="!"
+        latin:additionalMoreKeys="!"
         latin:moreKeys="!text/morekeys_h" />
     <Key
-        latin:keySpec="f" />
+        latin:keySpec="f"
+        latin:keyHintLabel="\?"
+        latin:additionalMoreKeys="\\?" />
 </merge>