Fix Where to work as advertised

This actually uses the right expression to filter the selected subdata and not just match on the whole data which just determines if there will be any output at all or not.