Update to use new query syntax.