Gameloft, Can we make assigning companions to companion homes like it is with characters?

Teeny tiny vent and problem, but when you assign a companion to a character, say Figaro with Minnie, and you then assign Figaro to yourself for a why and then eventually grab a different companion, Figaro will go back to being assigned to Minnie and you'll see the two walking around. But with companion houses, if you grab a companion, say the yellow baby Pegasus, and then switch companions, it won't go back to the assigned companion home. You won't see it playing in your stable any more. It just goes into you're inventory and you have to reassign it to the companion house to get it to walk around again.

It makes having favorites just a little obnoxious. I've started really decorating with companion homes recently and this little issue bugs me erasing what I've set up. Especially since I swap companions a lot for whatever resource I'm gathering.