Wrapping archive search filter in an OR

Addresses the first part of issue #218
Removing duplicate Filter

Addresses second part of issue #218. Fixes #218.