Order list functionality improved