Cannot add some ISO files after file-5.15 update - fix problems with qcow2 as well + refactoring