Consolidate EditionOrganisation filters for :new

Why have two filters when you can have one?