My understanding is that you will need an NOC from your last employer to re-enter Qatar under ANY visa - reason for a change in the law being I guess was that some unscrupulous people were coming back into the country under a tourist visa and obtaining new employment thus circumventing the NOC regulations - can you believe such a thing????!!!!????