Could make terrariums, jars, etc. a right-click furniture item? Right-click with a critter in hand and it puts the critter into the container. Right-click again with another critter to swap them over, or with an empty hand to remove the critter and leave an empty container.
From a peace of mind perspective, it'd feel nicer knowing that critters aren't permanently trapped in their container.