issue #21684: alternate approach to fix triggering bug
issue #21684: move order number and date higher