fix when there are additional suites and custom queries