change codable fields of Query object (remove cache ttl)
- also a bit of extra cleanup for Query; especially removing reference
to Sauron