Better next match finding