Resolve "Improve performance of selected SQL queries"
Description
[Describe changes/solution; problem description should be in issue]
Notes to review (code/docs/QA)
Related issues
Closes #2243 (closed)
[Describe changes/solution; problem description should be in issue]
Closes #2243 (closed)