Bug 813978 - Part 3: rewrite filtering by mix of any two conditions
Bug 813978 - Part 4:
Bug 813978 - Part 5: test cases for mixed filter targets.