filtering done - Some changes in the sorting