Fix filter builder behavior on existing attributes add