Filter field on top - Fixes #125