Issue 1619: Change "dynamic" to "filtered" deck.

I am traveling, so I am just applying my comments and sending you are separate pull request if that works for you.