Queries with soft ts set to deprecation date instead of current

Got other small improvements in formatting too.