Help with improving database query - Drizzle Team