Selector now takes into account group filtering again.
Merge pull request #1424 from jaypoulz/fire

Selector now takes into account group filtering again.