Addresses #150. Null activity values no longer match filters. Needs testing with real data.
Merge remote-tracking branch 'origin' into nullFilterFix