Rework filtering for investors and categories to shore up weirdness

@hkal Please review very carefully.

https://www.pivotaltracker.com/story/show/65751660