ni: replaced Comparable sorters with specific sorters introduced in model_utils