diff --git a/geninfo/genisolist.ini b/geninfo/genisolist.ini
index a144f97..0f35ac9 100644
--- a/geninfo/genisolist.ini
+++ b/geninfo/genisolist.ini
@@ -181,7 +181,7 @@ platform = $2
 distro = Qt 5 (含 Qt Creator)
 listvers = 1
 location = qt/official_releases/qt/5.*/5.*/qt-opensource-*
-pattern = qt-opensource-(.*)-([\d.]+).(run|dmg|exe)
+pattern = qt-opensource-(.*?)-([\d.]+).(run|dmg|exe)
 platform = $1
 version = $2
 category = app
@@ -200,7 +200,7 @@ category = app
 distro = VirtualBox
 listvers = 1
 location = virtualbox/virtualbox-*
-pattern = virtualbox-(.*)-(latest).(exe|dmg)
+pattern = virtualbox-(.*?)-(latest).(exe|dmg)
 platform = $1
 version = $2
 category = app
@@ -237,7 +237,7 @@ category = app
 distro = Anaconda
 listvers = 1
 location = anaconda/archive/Anaconda*
-pattern = (Anaconda\d*)-(\d+.\d+.\d+)-(Windows|Linux|MacOSX)-(x86|x86_64).\w+
+pattern = (Anaconda\d*)-(\d+.\d+.\d+)-(Windows|Linux|MacOSX)-(x86_64|x86).\w+
 platform = $3
 type = $4
 version = $2
diff --git a/geninfo/genisolist.py b/geninfo/genisolist.py
index fe0d005..0487e75 100644
--- a/geninfo/genisolist.py
+++ b/geninfo/genisolist.py
@@ -60,7 +60,7 @@ def parseSection(items):
             for prop in ("version", "type", "platform", "category"):
                 s = items.get(prop, "")
                 for i in range(0, group_count):
-                    s = s.replace("$%d" % i, result.group(i))
+                    s = s.replace("$%d" % i, result.group(i) or "")
                 imageinfo[prop] = s
 
             logger.debug("[JSON] %r", imageinfo)