diff --git a/apps/common/db/fields.py b/apps/common/db/fields.py
index bd968c734..4122aafb4 100644
--- a/apps/common/db/fields.py
+++ b/apps/common/db/fields.py
@@ -500,9 +500,11 @@ class JSONManyToManyDescriptor:
                     value = value.values_list('id', flat=True)
                 elif isinstance(value, models.Model):
                     value = [value.id]
+                if isinstance(rule_value, (str, int)):
+                    rule_value = [rule_value]
                 value = set(map(str, value))
                 rule_value = set(map(str, rule_value))
-                res &= value & rule_value
+                res &= bool(value & rule_value)
             else:
                 logging.error("unknown match: {}".format(rule['match']))
                 res &= False