AQ fixes, importing default queries, menu cleanup and other enhancements