Now picks up the correct prevCatmatchEndRow when it's in the last category