Change sorting to descending order
Fix issues