Update to query syntax