Issue #1944150 by esmerel, joelpittet, Chris2, dawehner, BrockBoland: Combine fields filter includes a duplicate condition in if() statement.