You can run my macro after the data is extracted into a table rather than directly into the pivot table. I don't know how to filter the row field if there are too many Clients.