fix cardtype errors, fallout from refactor for maestro, RT#10012