Fix: card position and search
