Improve direct stop search by stop number