Fixed Has Cards condition definitions so they work with the new criterion value