Changing queries to use new order column.