you need to leave on April 22 before 12 midnight to avoid any penalty as it is quite expensive 200 QR per day of overstaying..I am working in visa section at a small hotel here in Doha by the way.