Major rewriting of filters components.