Added sort by feature