Sort without Changing Borders

My spreadsheet (sample attached) is sorted by Incident # (column B). Borders are applied so that when multiple rows have the same incident number, the only horizontal borders are the top of the first row and the bottom of the last row. When I later need to paste additional rows to the end, I re-sort the whole file after pasting. However, this keeps the borders in the same cells even though the order of the data has changed. I would like the borders to follow the data so that after the re-sort, the rows with the same incident number are still in the same box. I cannot figure out how to do this. I tried conditional formatting, but there is no rule that will always be true, so I could not figure out how to apply it to all situations.

I can't get that formula to work for me even with changing the "C"s to "B"s.

Hi

Use tables. You can sort by any column. Use CF to format as desired
Use in FC (second table) =$B16=$B17 (apply to all rows and in limits remove last line)
See the file