Major refactor / fix of filter-versioning