Update contact filtering

issue #2240