Fixed AQ query forms
Merge branch 'nextgen' of https://github.com/NCIP/catissue-core into nextgen