Fidelity 401k and HSA How to setup in Quicken

I have a Fidelity 401K and HSA and looking for help/tips/suggestions on how to best setup the accounts in Quicken.

My 401K is setup as a brokerage account is connected online via Fidelity Netbenefits. That I think is all setup fine, and I'm happy with it.

I had my Fidelity HSA setup as a manual savings type account with no online connection. I would add funds into the account via a memorized paycheck transaction and manually enter debits as they occurred.

I've just recently started investing some of my HSA funds inside my HSA account.

I did try to activate the HSA savings account online via edit and then selecting the online tab. I used Fidelity Investments as opposed to Fidelity Netbenefits and used the same username and password that I use for Fidelity Netbenefits. I did this due to some other threads I read on this forum. To my surprise it did find my HSA account in the process and downloaded a number of transactions. However, it created a new brokerage account instead of downloading them to my existing HSA savings account. Also, it did not download the investment transaction.

I'm thinking of continuing to use this new brokerage account it created, but not sure why it didn't download the investment type transactions just the deposit/debit type transactions.