fixed flagging
fixed ordering on list page
Merge branch 'master' into feature/claim-tree