WIP.
diff --git a/README.md b/README.md
index 7168998..4d8c8c7 100644
--- a/README.md
+++ b/README.md
@@ -148,7 +148,7 @@
- "{<ACTION>|shut|kill|stop|eliminate} {off|out} <LIGHT>"
- "no <LIGHT>"
intents:
- - "intent=ls term(act)~{groups @@ 'act'} term(loc)~{id == 'ls:loc'}*"
+ - "intent=ls term(act)~{has(groups(), 'act')} term(loc)~{id() == 'ls:loc'}*"
```
### Model Implementation
diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/examples/sql/SqlModel.scala b/nlpcraft/src/main/scala/org/apache/nlpcraft/examples/sql/SqlModel.scala
index 63cecb1..4089507 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/examples/sql/SqlModel.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/examples/sql/SqlModel.scala
@@ -278,8 +278,8 @@
*/
@NCIntent(
"intent=commonReport " +
- "term(tbls)~{groups @@ 'table'}[0,7] " +
- "term(cols)~{id() == 'col:date' || id == 'col:num' || id == 'col:varchar'}[0,7] " +
+ "term(tbls)~{has(groups(), 'table')}[0,7] " +
+ "term(cols)~{id() == 'col:date' || id() == 'col:num' || id() == 'col:varchar'}[0,7] " +
"term(condNums)~{id() == 'condition:num'}[0,7] " +
"term(condVals)~{id() == 'condition:value'}[0,7] " +
"term(condDates)~{id() == 'condition:date'}[0,7] " +
diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/test/NCTestClient.java b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/test/NCTestClient.java
index c631f57..46f57a3 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/test/NCTestClient.java
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/test/NCTestClient.java
@@ -98,8 +98,6 @@
void clearConversation() throws NCTestClientException, IOException;
/**
- * TODO:
- *
* @throws NCTestClientException Thrown if any test system errors occur.
* @throws IOException Thrown in case of I/O errors.
*/
diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/dialogflow/NCDialogFlowManager.scala b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/dialogflow/NCDialogFlowManager.scala
index aeb931f..f8bb4cb 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/dialogflow/NCDialogFlowManager.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/dialogflow/NCDialogFlowManager.scala
@@ -110,7 +110,7 @@
override def getTermTokens(idx: Int) = intentMatch.getTermTokens(idx)
override def getTermTokens(termId: String) = intentMatch.getTermTokens(termId)
override val getVariant = intentMatch.getVariant
- override val isAmbiguous = !res.isExactMatch // TODO: rename for consistency?
+ override val isAmbiguous = !res.isExactMatch
override val getUser = req.getUser
override val getCompany = req.getCompany
override val getServerRequestId = req.getServerRequestId
