actually .filter().map() should do the trick as addAll() will override existing attributes (no need to remove)