Sort + small fix