[Cloud] Can this query be optimized further?