Implement new query syntax.