Fix AAQ for other questions