Is there a smarter way to use optional query values - Drizzle Team