Filter with merged cells maybe there is an alternative way

Hi everybody, as my account name, I am new here.

Straight to my problem

I am organizing an audit summary.
For each company, there are 10 rows, and the first few columns (say A, B,and C), they are merged for COMPANY NAME, LOCATION, NUMBER.
Then from column D, it starts revision records, which means 10 rows may or may not be filled completely. Some may be filled up to the 5th row, and some are only 2nd row.

So later when I am trying to filter by those who are in the 2nd revision, problem comes. Autofit doesn't work which is expected, but also the entire worksheet looks not nice.

What I would like to have is to filter on the revision column, but no mater how many rows are filled in, it will be nice if all 10 rows for the companies that satisfy the 2nd revision to show up as the entire 10 rows.

Any one could provide me with a good idea ?

big thanks