corrected-singleton-issue-query-classes