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

Selector now takes into account group filtering again.
Removed Name Units and Type from the Fields table header when there are no items in the set
Merge pull request #1429 from umin18/yc1426

Issue #1426