diff --git a/src/calibre/devices/hanvon/driver.py b/src/calibre/devices/hanvon/driver.py
index 6291864b86..bea65b0e50 100644
--- a/src/calibre/devices/hanvon/driver.py
+++ b/src/calibre/devices/hanvon/driver.py
@@ -59,14 +59,14 @@ class ALEX(N516):
     description    = _('Communicate with the SpringDesign Alex eBook reader.')
     author         = 'Kovid Goyal'
 
-    FORMATS     = ['epub', 'pdf']
+    FORMATS     = ['epub', 'fb2', 'pdf']
     VENDOR_NAME      = 'ALEX'
     WINDOWS_MAIN_MEM = 'READER'
 
     MAIN_MEMORY_VOLUME_LABEL  = 'Alex Internal Memory'
 
     EBOOK_DIR_MAIN = 'eBooks'
-    SUPPORTS_SUB_DIRS = True
+    SUPPORTS_SUB_DIRS = False
 
     def can_handle(self, device_info, debug=False):
         return is_alex(device_info)
diff --git a/src/calibre/library/restore.py b/src/calibre/library/restore.py
index c81cf7abcb..ab4e59a4c3 100644
--- a/src/calibre/library/restore.py
+++ b/src/calibre/library/restore.py
@@ -39,7 +39,7 @@ class Restore(Thread):
         self.src_library_path = os.path.abspath(library_path)
         self.progress_callback = progress_callback
         self.db_id_regexp = re.compile(r'^.* \((\d+)\)$')
-        self.bad_ext_pat = re.compile(r'[^a-z]+')
+        self.bad_ext_pat = re.compile(r'[^a-z0-9]+')
         if not callable(self.progress_callback):
             self.progress_callback = lambda x, y: x
         self.dirs = []