Fixes waiting setting, card displaying