Fixes traceback on completion for Vendor name
Corrects joins between (Vendor, software) and (software, version)