You got it right. You would combine those two locations into one bigger version. There is no rules about needing to draw another card or switch suits for subsequent duplicate draws.
