Merge branch 'hotfix/fieldTypo'
* fix: refactor and:[] condition and check for valid results.
Merge branch 'hotfix/fixAndCondition' into develop