658 add sorting to org page