Yes that is correct, and exactly as I did as per my post above.
If you haven’t been to Doha before I would recommend the transit tour for 40 QAR. It’s a bit Truman Show-esque but is an easy way to see a few different bits of Doha and you get some time to wander round the souk at the end.
https://www.qatarairways.com/en-gb/o...city-tour.html