Selector now takes into account group filtering again.

VITAL FIX FOR SCATTER/TIMELINE

* Please pull for release *