Fix on order searching