NAWQAAN-207

* Clearing up the chaining on this selector