Just enter in each transaction as a different brokerage:
Charles Schwab 1,
Charles Schwab 2.....
That seemed to work for me and is probably a bit simpler.
But fully agree this is a bad bug that should be fixed. I've also used this for years and this is the first year I've seen this broken.
