Fix makeCardSelector regressions, apply similar optimization to initTrade