Activity filter

This is just #883 pointing toward master.