Changing taxonomy term on node doesn't move it to other sub-queue

I have a taxonomy assigned to a SmartQueue. When I initially create a node and give it a term in this taxonomy, the node is automatically placed within the proper sub-queue. This is good.

However, if I edit the node and change the taxonomy term assigned to the node and save it, the node is still a member of the original sub-queue. This is bad.

When using a SmartQueue, it seems like the node should be automatically moved from the original sub-queue into the sub-queue for the new taxonomy term. Otherwise it's not very "smart" and my clients end up doing a lot or manual messing around with removing a node from the original subqueue and then having to manually add it to the proper subqueue for the new term.