Simplified queries for readability

Queries are dummies due to IP concerns, but they should still be readable dummies.