Change FilterFactory code to pass in the actual Description

I still need to write more tests, but I wanted to send this out for an early look.
Fair enough; I'm not sure that having three lines that assign filterSpec and then one that adds it to a list feels like less duplication than just adding the right value directly to the list when we compute it, but I don't feel strongly enough to belabor the point.