Fix logical bug

Fix logical bug when filtering by custom field with few properties