Filter suggestions

Fixes #1996