CLC-1971 Fix ID class mismatch in Canvas activity matching