GUI-1088added support for tags and block device mappings