Add vendor and tool to sort order