N+1 Query fixes batch_2

[pavlo-mk]

AB#302422: improve performance and avoid Queries N+1

[codecov]

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 91.06%. Comparing base (3ac8685) to head (935cc9a).
⚠️ Report is 6 commits behind head on develop.

Additional details and impacted files

@@           Coverage Diff            @@
##           develop    #5796   +/-   ##
========================================
  Coverage    91.06%   91.06%           
========================================
  Files          500      500           
  Lines        34264    34270    +6     
  Branches      3540     3540           
========================================
+ Hits         31201    31207    +6     
  Misses        2272     2272           
  Partials       791      791           

Flag	Coverage Δ
e2e	52.75% <9.09%> (-0.01%)	⬇️
unit	90.68% <100.00%> (+<0.01%)	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

• ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
• 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.