bug-fix-empty-main-query