Added proper handling for case when only one filter is null
Merge pull request #489