fix comment blocks, specify not to add filters for target
fix multi-entity custom fields to only filter if parent entity has filters