Improved searching to weigh in the order count