Added sortby feature