diff --git a/backend/WebUI/api_charging.go b/backend/WebUI/api_charging.go
index b46b1f8f409af027d5771a70ce64ab33ee25fea8..3f92b0703f65d6d03980aecc97d860561a786c6c 100644
--- a/backend/WebUI/api_charging.go
+++ b/backend/WebUI/api_charging.go
@@ -89,7 +89,10 @@ func GetChargingData(c *gin.Context) {
 		return
 	}
 
-	filter := bson.M{"chargingMethod": chargingMethod}
+	filter := bson.M{
+		"chargingMethod": chargingMethod,
+		"ratingGroup":    nil,
+	}
 	chargingDataInterface, err := mongoapi.RestfulAPIGetMany(chargingDataColl, filter)
 	if err != nil {
 		logger.BillingLog.Errorf("mongoapi error: %+v", err)
diff --git a/frontend/src/pages/SubscriberCreate.tsx b/frontend/src/pages/SubscriberCreate.tsx
index 8b17fb99c16f8859ee6429497965b973858f587d..4a6a918a4ff0789b06ae4ff54d375beb8d90d62f 100644
--- a/frontend/src/pages/SubscriberCreate.tsx
+++ b/frontend/src/pages/SubscriberCreate.tsx
@@ -1757,7 +1757,7 @@ export default function SubscriberCreate() {
                 </TableRow>
               </TableBody>
             </Table>
-            {chargingConfig(undefined, row.singleNssai!, undefined)}
+            {chargingConfig("", row.singleNssai!, "")}
             {row.dnnConfigurations &&
               Object.keys(row.dnnConfigurations!).map((dnn) => (
                 <div
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index 2778db26dce374fa2c413e20d22480a11ad6956e..6b1c07edc9de1d4ccf851b0c6467cb2bfd2a2348 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -2425,12 +2425,12 @@ __metadata:
   linkType: hard
 
 "follow-redirects@npm:^1.15.4":
-  version: 1.15.5
-  resolution: "follow-redirects@npm:1.15.5"
+  version: 1.15.6
+  resolution: "follow-redirects@npm:1.15.6"
   peerDependenciesMeta:
     debug:
       optional: true
-  checksum: 10c0/418d71688ceaf109dfd6f85f747a0c75de30afe43a294caa211def77f02ef19865b547dfb73fde82b751e1cc507c06c754120b848fe5a7400b0a669766df7615
+  checksum: 10c0/9ff767f0d7be6aa6870c82ac79cf0368cd73e01bbc00e9eb1c2a16fbb198ec105e3c9b6628bb98e9f3ac66fe29a957b9645bcb9a490bb7aa0d35f908b6b85071
   languageName: node
   linkType: hard