Cleanup some code in the helper

This was driving me nuts
Add support for ids
Selector can be whatever now for embed - this solution isn't very good. Still rubber ducking