Simplified suggestion filtering when switching between corpora.

Fixes bugs 2798084, 2798081. Don't understand why it fixes the 2nd one.

Change-Id: I6e25b77e73ca7b7b6869c283e2496bfa14242248
3 files changed