I'm not sure what you're doing on the switch... normally this would not be required unless you're specifically filtering things there (which is an edge case).
But that said, it sounds like you have a solution, so that's good!
If your problem is solved, please consider marking this topic as [Solved]. See How to mark a topic as [Solved] for a short how-to.
Thanks!