Query API only supports version 2
Clean up conditions by using a list
Wrap to 80