~~ fix NPE
~~ add draft FilterEdgesCreator.
~~ Ok?