WIP: fixed sorted result update