improved query syntax