* WIP: Fix null thresholds in overrides when loading * Fix thresholds on load instead of in apply field overrides * simplify expression * fixed ts issue * Updated test * Updated another test * Updated another test
