RR: filter and sort on org page
RR: fix tests, close #658