#498: change sortindex, fix tests