[TW223] Updated QC. Better output and original query