Optimized queries, added transients