[TW213] updated qc with a fix
[TW213] Updated qc with some checks and changed query