Fixed bugs caused by autoresolve in OrderController