Bug on OR and AND block fixed.

Jira-issue HUBHAC-7