Dropping the `chosen:true` filter is fine as long as this PR doesn't regress issue #1107 .