More consistent query syntax, fix nested verb call bug.