Marked filters stateful, fixes #124