Fix order search issue