diff --git a/src/RESTAPI_inventory_handler.cpp b/src/RESTAPI_inventory_handler.cpp
index 968d5c1..e390cd1 100644
--- a/src/RESTAPI_inventory_handler.cpp
+++ b/src/RESTAPI_inventory_handler.cpp
@@ -228,7 +228,7 @@ namespace OpenWifi{
                 if(!ExistingObject.venue.empty()) {
                     Storage()->VenueDB().DeleteDevice("id",ExistingObject.venue,ExistingObject.info.id);
                 } else if(!ExistingObject.entity.empty()) {
-                    Storage()->EntityDB().DeleteDevice("id",ExistingObject.venue,ExistingObject.info.id);
+                    Storage()->EntityDB().DeleteDevice("id",ExistingObject.entity,ExistingObject.info.id);
                 }
                 ExistingObject.venue.clear();
                 ExistingObject.entity.clear();
diff --git a/test_scripts/curl/cli b/test_scripts/curl/cli
index 5cc74ca..5e6d5f9 100755
--- a/test_scripts/curl/cli
+++ b/test_scripts/curl/cli
@@ -200,8 +200,18 @@ addunassignedtag() {
     jq < ${result_file}
 }
 
-assigntag() {
-    payload="{\"serialNumber\" : \"$1\", \"deviceType\" : \"linksys_ea8300\" ,\"entity\" : \"$2\"}";
+assigntagentity() {
+    payload="{\"serialNumber\" : \"$1\", \"entity\" : \"$2\"}";
+    curl    ${FLAGS} -X PUT "https://${OWPROV}/api/v1/inventory/$1" \
+    -H "Content-Type: application/json" \
+    -H "Authorization: Bearer ${token}" \
+    -H "accept: application/json" \
+    -d "$payload" > ${result_file}
+    jq < ${result_file}
+}
+
+assigntagvenue() {
+    payload="{\"serialNumber\" : \"$1\", \"venue\" : \"$2\"}";
     curl    ${FLAGS} -X PUT "https://${OWPROV}/api/v1/inventory/$1" \
     -H "Content-Type: application/json" \
     -H "Authorization: Bearer ${token}" \
@@ -357,6 +367,8 @@ case "$1" in
     "listconfigs") login; listconfigs ; logout;;
     "getconfig") login; getconfig "$2"; logout;;
     "deleteconfig") login; deleteconfig "$2"; logout;;
+    "assigntagentity") login; assigntagentity "$2" "$3"; logout;;
+    "assigntagvenue") login; assigntagvenue "$2" "$3"; logout;;
     "setentityconfig") login; setentityconfig "$2" "$3"; logout;;
     *) help ;;
 esac