Fix threshold range initialization bug
Reorganize ThresholdService definitions

Also fix bugs in tracking of default threshold options