Bug 813978 - Part 3/5: rewrite filtering by mix of any two conditions. r=ferjm
Bug 813978 - Part 4/5: rewrite filtering by multiple phone numbers.
Bug 813978 - Part 5: test cases for mixed filter targets.