updated the order by to be based on name