Solved 30 dec issues
fixed the sorting bug
fixed the sorting bug