Bug6

Solves Bug #6. Almost. (Some filters missing.)