Replicating MID-1873. Filter toString fixes.