This will move two subqueries into CTEs
and let them use the existing index with smarter query plans.

Changelog: performance