Merge pull request #2439 from JosJuice/company-from-id Use an ID-to-name map when volume has no company string
