Fix and update GI annotations for 'Volumes and Drives'