AQ form related issue changes