small CQID fixes