Minor improvement on card ids