Move non common filter definitions to correct filters

Fixes #61