diff --git a/kvirt/cli.py b/kvirt/cli.py
index a159ed328..140df46a4 100755
--- a/kvirt/cli.py
+++ b/kvirt/cli.py
@@ -722,13 +722,13 @@ def _filter_info_plan(_list, overrides={}):
         if field is not None:
             if field not in entry:
                 continue
+            if value is not None and entry[field] != value:
+                continue
             if name is not None:
                 if entry['name'] == name:
                     return entry[field]
                 else:
                     continue
-            if value is not None and entry[field] != value:
-                continue
             new_entry = {entry['name']: entry[field]}
         new_list.append(new_entry)
     return new_list
diff --git a/kvirt/providers/kvm/__init__.py b/kvirt/providers/kvm/__init__.py
index 8d495ab9e..6d8b8cd2f 100644
--- a/kvirt/providers/kvm/__init__.py
+++ b/kvirt/providers/kvm/__init__.py
@@ -574,7 +574,10 @@ def create(self, name, virttype=None, profile='kvirt', flavor=None, plan='kvirt'
 <readonly/>
 %s
 <address type='drive' controller='0' bus='0' target='0' unit='0'/>
-</disk>""" % (isosourcexml, isobus, bootdevxml)
+</disk>
+<controller type='scsi' index='0' model='virtio-scsi'>
+<alias name='scsi0'/>
+</controller>""" % (isosourcexml, isobus, bootdevxml)
         floppyxml = ''
         floppy = overrides.get('floppy')
         if floppy is not None:
@@ -828,7 +831,10 @@ def create(self, name, virttype=None, profile='kvirt', flavor=None, plan='kvirt'
 <target dev='hdd' bus='%s'/>
 <readonly/>
 %s
-</disk>""" % (dtype, dsource, cloudinitiso, isobus, bootdevxml)
+</disk>
+<controller type='scsi' index='0' model='virtio-scsi'>
+<alias name='scsi0'/>
+</controller>""" % (dtype, dsource, cloudinitiso, isobus, bootdevxml)
                 dest_machine = 'q99' if aarch64_full else machine
                 if ignitiondata is not None:
                     userdata, metadata, netdata = ignitiondata, '', None