Optimize card moves (no more remove/add)