fix multi-entity custom fields to only filter when parent entity has filters