Improve performance of ThresholdValue admin