The final sorting bug (null value dates) is now fixed