QR fix and validation fix