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.