data wizard
[#72053780] allow AQE and AQS to be joined