Fix filter contacts by labels with archives
Merge branch 'MH-934' into dev