Mapping filter fields for D3S v2.0