Cleanup of & in field names and some boolean/numeric comparisons in condition text

Cleanup of & in field names and some boolean/numeric comparisons in condition text

@ttl269, @throttlekitty @skyfox69 @amorilia