Ascending and Descending sorting now works