Added initial sort and fixed date sort