diff --git a/bgpd/bgp_nb_config.c b/bgpd/bgp_nb_config.c
index b974f2f367..5a88bd08d9 100644
--- a/bgpd/bgp_nb_config.c
+++ b/bgpd/bgp_nb_config.c
@@ -21848,8 +21848,7 @@ int bgp_neighbors_neighbor_afi_safis_afi_safi_ipv6_labeled_unicast_filter_config
 	case NB_EV_PREPARE:
 	case NB_EV_ABORT:
 	case NB_EV_APPLY:
-		/* TODO: implement me. */
-		break;
+		return bgp_neighbor_afi_safi_plist_modify(args, FILTER_IN);
 	}
 
 	return NB_OK;
@@ -21863,8 +21862,7 @@ int bgp_neighbors_neighbor_afi_safis_afi_safi_ipv6_labeled_unicast_filter_config
 	case NB_EV_PREPARE:
 	case NB_EV_ABORT:
 	case NB_EV_APPLY:
-		/* TODO: implement me. */
-		break;
+		return bgp_neighbor_afi_safi_plist_destroy(args, FILTER_IN);
 	}
 
 	return NB_OK;
@@ -22992,8 +22990,7 @@ int bgp_neighbors_neighbor_afi_safis_afi_safi_l3vpn_ipv4_unicast_filter_config_p
 	case NB_EV_ABORT:
 		return NB_OK;
 	case NB_EV_APPLY:
-		bgp_neighbor_afi_safi_plist_modify(args, FILTER_IN);
-		break;
+		return bgp_neighbor_afi_safi_plist_modify(args, FILTER_IN);
 	}
 
 	return NB_OK;
@@ -48254,7 +48251,7 @@ int bgp_peer_groups_peer_group_afi_safis_afi_safi_ipv6_flowspec_filter_config_rm
 	case NB_EV_ABORT:
 		break;
 	case NB_EV_APPLY:
-		return bgp_peer_group_afi_safi_plist_destroy(args, FILTER_IN);
+		return bgp_peer_group_afi_safi_rmap_destroy(args, RMAP_OUT);
 	}
 
 	return NB_OK;
@@ -48288,7 +48285,7 @@ int bgp_peer_groups_peer_group_afi_safis_afi_safi_ipv6_flowspec_filter_config_pl
 	case NB_EV_ABORT:
 		break;
 	case NB_EV_APPLY:
-		return bgp_peer_group_afi_safi_rmap_destroy(args, RMAP_OUT);
+		return bgp_peer_group_afi_safi_plist_destroy(args, FILTER_IN);
 	}
 
 	return NB_OK;