Sorted by value for #2 and put pagination in place for #1