diff --git a/src/modules/kazoo/defs.h b/src/modules/kazoo/defs.h
index ca355f5e4da..6059f53b7a6 100644
--- a/src/modules/kazoo/defs.h
+++ b/src/modules/kazoo/defs.h
@@ -42,6 +42,9 @@
 #define BLF_JSON_TO_REALM	"To-Realm"
 #define BLF_JSON_TO_URI		"To-URI"
 #define BLF_JSON_CALLID    	"Call-ID"
+#define BLF_JSON_DIALOGID   "Dialog-ID"
+#define BLF_JSON_SENDER    	"Sender-URI"
+#define BLF_JSON_ETAG    	"ETag"
 #define BLF_JSON_TOTAG     	"To-Tag"
 #define BLF_JSON_FROMTAG   	"From-Tag"
 #define BLF_JSON_STATE     	"State"
diff --git a/src/modules/kazoo/kz_pua.c b/src/modules/kazoo/kz_pua.c
index 3c1e3cfba36..d69100ed58e 100644
--- a/src/modules/kazoo/kz_pua.c
+++ b/src/modules/kazoo/kz_pua.c
@@ -196,6 +196,8 @@ int kz_pua_publish_presence_to_presentity(struct json_object *json_obj) {
     str note = str_init("Available");
     str status = str_presence_status_online;
     int expires = 0;
+	str sender = {0, 0},
+	etag = { 0, 0 };
 
     char *body = (char *)pkg_malloc(PRESENCE_BODY_BUFFER_SIZE);
     if(body == NULL) {
@@ -204,387 +206,386 @@ int kz_pua_publish_presence_to_presentity(struct json_object *json_obj) {
     	goto error;
     }
 
-    json_extract_field(BLF_JSON_FROM, from);
-    json_extract_field(BLF_JSON_FROM_USER, from_user);
-    json_extract_field(BLF_JSON_FROM_REALM, from_realm);
-    json_extract_field(BLF_JSON_TO, to);
-    json_extract_field(BLF_JSON_TO_USER, to_user);
-    json_extract_field(BLF_JSON_TO_REALM, to_realm);
-    json_extract_field(BLF_JSON_CALLID, callid);
-    json_extract_field(BLF_JSON_FROMTAG, fromtag);
-    json_extract_field(BLF_JSON_TOTAG, totag);
-    json_extract_field(BLF_JSON_DIRECTION, direction);
-    json_extract_field(BLF_JSON_STATE, state);
-
-    struct json_object* ExpiresObj =  kz_json_get_object(json_obj, BLF_JSON_EXPIRES);
-    if(ExpiresObj != NULL) {
-    	expires = json_object_get_int(ExpiresObj);
-    	if(expires > 0)
-    		expires += (int)time(NULL);
-    }
+	json_extract_field(BLF_JSON_FROM, from);
+	json_extract_field(BLF_JSON_FROM_USER, from_user);
+	json_extract_field(BLF_JSON_FROM_REALM, from_realm);
+	json_extract_field(BLF_JSON_TO, to);
+	json_extract_field(BLF_JSON_TO_USER, to_user);
+	json_extract_field(BLF_JSON_TO_REALM, to_realm);
+	json_extract_field(BLF_JSON_CALLID, callid);
+	json_extract_field(BLF_JSON_FROMTAG, fromtag);
+	json_extract_field(BLF_JSON_TOTAG, totag);
+	json_extract_field(BLF_JSON_DIRECTION, direction);
+	json_extract_field(BLF_JSON_STATE, state);
+
+	json_extract_field(BLF_JSON_ETAG, etag);
+	json_extract_field(BLF_JSON_SENDER, sender);
+
+	struct json_object* ExpiresObj = kz_json_get_object(json_obj, BLF_JSON_EXPIRES);
+	if (ExpiresObj != NULL) {
+		expires = json_object_get_int(ExpiresObj);
+		if (expires > 0)
+			expires += (int) time(NULL);
+	}
 
-    if (!from_user.len || !to_user.len || !state.len) {
-    	LM_ERR("missing one of From / To / State\n");
-    	goto error;
-    }
+	if (!from_user.len || !to_user.len || !state.len) {
+		LM_ERR("missing one of From / To / State\n");
+		goto error;
+	}
 
-    if (!strcmp(state.s, "early")) {
-    	note = str_presence_note_busy;
-    	activity = str_presence_act_busy;
+	if (!strcmp(state.s, "early")) {
+		note = str_presence_note_busy;
+		activity = str_presence_act_busy;
 
-    } else if (!strcmp(state.s, "confirmed")) {
-    	note = str_presence_note_otp;
-    	activity = str_presence_act_otp;
+	} else if (!strcmp(state.s, "confirmed")) {
+		note = str_presence_note_otp;
+		activity = str_presence_act_otp;
 
-    } else if (!strcmp(state.s, "offline")) {
-    	note = str_presence_note_offline;
-    	status = str_presence_status_offline;
+	} else if (!strcmp(state.s, "offline")) {
+		note = str_presence_note_offline;
+		status = str_presence_status_offline;
 
-    }; // else {
-    //	note = str_presence_note_idle;
-//    }
+	};
 
+	sprintf(body, PRESENCE_BODY, from_user.s, callid.s, status.s, note.s, activity.s, note.s);
 
-    sprintf(body, PRESENCE_BODY, from_user.s, callid.s, status.s, note.s, activity.s, note.s);
+	presence_body.s = body;
+	presence_body.len = strlen(body);
 
-    presence_body.s = body;
-    presence_body.len = strlen(body);
+	if (sender.len == 0) {
+		sender = from;
+	}
 
-    if(dbk_pua_mode == 1) {
-    	kz_pua_update_presentity(&event, &from_realm, &from_user, &callid, &from, &presence_body, expires, 1);
-    }
+	if (etag.len == 0) {
+		etag = callid;
+	}
+
+	kz_pua_update_presentity(&event, &from_realm, &from_user, &etag, &sender, &presence_body, expires, 1);
 
- error:
+error:
 
- if(body)
-	  pkg_free(body);
+	if (body)
+		pkg_free(body);
 
- return ret;
+	return ret;
 
 }
 
-int kz_pua_publish_mwi_to_presentity(struct json_object *json_obj) {
-    int ret = 1;
-    str event = str_init("message-summary");
-    str from = { 0, 0 }, to = { 0, 0 };
-    str from_user = { 0, 0 }, to_user = { 0, 0 };
-    str from_realm = { 0, 0 }, to_realm = { 0, 0 };
-    str callid = { 0, 0 }, fromtag = { 0, 0 }, totag = { 0, 0 };
-    str mwi_user = { 0, 0 }, mwi_waiting = { 0, 0 },
-        mwi_new = { 0, 0 }, mwi_saved = { 0, 0 },
-        mwi_urgent = { 0, 0 }, mwi_urgent_saved = { 0, 0 },
-        mwi_account = { 0, 0 }, mwi_body = { 0, 0 };
-    int expires = 0;
+int kz_pua_publish_mwi_to_presentity(struct json_object *json_obj)
+{
+	int ret = 1;
+	str event = str_init("message-summary");
+	str from = {0, 0},
+	to = { 0, 0 };
+	str from_user = { 0, 0 }, to_user = { 0, 0 };
+	str from_realm = { 0, 0 }, to_realm = { 0, 0 };
+	str callid = { 0, 0 }, fromtag = { 0, 0 }, totag = { 0, 0 };
+	str mwi_user = { 0, 0 }, mwi_waiting = { 0, 0 }, mwi_new = { 0, 0 }, mwi_saved = { 0, 0 }, mwi_urgent = { 0, 0 }, mwi_urgent_saved = { 0, 0 }, mwi_account = { 0, 0 },
+	        mwi_body = { 0, 0 };
+	int expires = 0;
+	str sender = { 0, 0 }, etag = { 0, 0 };
+
+	char *body = (char *) pkg_malloc(MWI_BODY_BUFFER_SIZE);
+	if (body == NULL) {
+		LM_ERR("Error allocating buffer for publish\n");
+		ret = -1;
+		goto error;
+	}
 
-    char *body = (char *)pkg_malloc(MWI_BODY_BUFFER_SIZE);
-    if(body == NULL) {
-    	LM_ERR("Error allocating buffer for publish\n");
-    	ret = -1;
-    	goto error;
-    }
+	json_extract_field(BLF_JSON_FROM, from);
+	json_extract_field(BLF_JSON_FROM_USER, from_user);
+	json_extract_field(BLF_JSON_FROM_REALM, from_realm);
+	json_extract_field(BLF_JSON_TO, to);
+	json_extract_field(BLF_JSON_TO_USER, to_user);
+	json_extract_field(BLF_JSON_TO_REALM, to_realm);
+	json_extract_field(BLF_JSON_CALLID, callid);
+	json_extract_field(BLF_JSON_FROMTAG, fromtag);
+	json_extract_field(BLF_JSON_TOTAG, totag);
+
+	json_extract_field(MWI_JSON_TO, mwi_user);
+	json_extract_field(MWI_JSON_WAITING, mwi_waiting);
+	json_extract_field(MWI_JSON_NEW, mwi_new);
+	json_extract_field(MWI_JSON_SAVED, mwi_saved);
+	json_extract_field(MWI_JSON_URGENT, mwi_urgent);
+	json_extract_field(MWI_JSON_URGENT_SAVED, mwi_urgent_saved);
+	json_extract_field(MWI_JSON_ACCOUNT, mwi_account);
+
+	json_extract_field(BLF_JSON_ETAG, etag);
+	json_extract_field(BLF_JSON_SENDER, sender);
+
+	struct json_object* ExpiresObj = kz_json_get_object(json_obj, BLF_JSON_EXPIRES);
+	if (ExpiresObj != NULL) {
+		expires = json_object_get_int(ExpiresObj);
+		if (expires > 0)
+			expires += (int) time(NULL);
+	}
 
-    json_extract_field(BLF_JSON_FROM, from);
-    json_extract_field(BLF_JSON_FROM_USER, from_user);
-    json_extract_field(BLF_JSON_FROM_REALM, from_realm);
-    json_extract_field(BLF_JSON_TO, to);
-    json_extract_field(BLF_JSON_TO_USER, to_user);
-    json_extract_field(BLF_JSON_TO_REALM, to_realm);
-    json_extract_field(BLF_JSON_CALLID, callid);
-    json_extract_field(BLF_JSON_FROMTAG, fromtag);
-    json_extract_field(BLF_JSON_TOTAG, totag);
-
-    json_extract_field(MWI_JSON_TO, mwi_user);
-    json_extract_field(MWI_JSON_WAITING, mwi_waiting);
-    json_extract_field(MWI_JSON_NEW, mwi_new);
-    json_extract_field(MWI_JSON_SAVED, mwi_saved);
-    json_extract_field(MWI_JSON_URGENT, mwi_urgent);
-    json_extract_field(MWI_JSON_URGENT_SAVED, mwi_urgent_saved);
-    json_extract_field(MWI_JSON_ACCOUNT, mwi_account);
-
-    struct json_object* ExpiresObj =  kz_json_get_object(json_obj, BLF_JSON_EXPIRES);
-    if(ExpiresObj != NULL) {
-    	expires = json_object_get_int(ExpiresObj);
-    	if(expires > 0)
-    		expires += (int)time(NULL);
-    }
+	sprintf(body, MWI_BODY, mwi_waiting.len, mwi_waiting.s, mwi_account.len, mwi_account.s, mwi_new.len, mwi_new.s, mwi_saved.len, mwi_saved.s, mwi_urgent.len,
+	        mwi_urgent.s, mwi_urgent_saved.len, mwi_urgent_saved.s);
 
-    sprintf(body, MWI_BODY, mwi_waiting.len, mwi_waiting.s,
-	    mwi_account.len, mwi_account.s, mwi_new.len, mwi_new.s,
-	    mwi_saved.len, mwi_saved.s, mwi_urgent.len, mwi_urgent.s,
-	    mwi_urgent_saved.len, mwi_urgent_saved.s);
+	mwi_body.s = body;
+	mwi_body.len = strlen(body);
 
-    mwi_body.s = body;
-    mwi_body.len = strlen(body);
+	if (sender.len == 0) {
+		sender = from;
+	}
 
-    if(dbk_pua_mode == 1) {
-    	kz_pua_update_presentity(&event, &from_realm, &from_user, &callid, &from, &mwi_body, expires, 1);
-    }
+	if (etag.len == 0) {
+		etag = callid;
+	}
 
- error:
+	kz_pua_update_presentity(&event, &from_realm, &from_user, &etag, &from, &mwi_body, expires, 1);
 
-   if(body)
-	  pkg_free(body);
+	error:
 
+	if (body)
+		pkg_free(body);
 
-   return ret;
+	return ret;
 }
 
-int kz_pua_publish_dialoginfo_to_presentity(struct json_object *json_obj) {
-    int ret = 1;
-    str from = { 0, 0 }, to = { 0, 0 }, pres = {0, 0};
-    str from_user = { 0, 0 }, to_user = { 0, 0 }, pres_user = { 0, 0 };
-    str from_realm = { 0, 0 }, to_realm = { 0, 0 }, pres_realm = { 0, 0 };
-    str from_uri = { 0, 0 }, to_uri = { 0, 0 };
-    str callid = { 0, 0 }, fromtag = { 0, 0 }, totag = { 0, 0 };
-    str state = { 0, 0 };
-    str direction = { 0, 0 };
-    char sender_buf[1024];
-    str sender = {0, 0};
-    str dialoginfo_body = {0 , 0};
-    int expires = 0;
-    str event = str_init("dialog");
-    int reset = 0;
-    char to_tag_buffer[100];
-    char from_tag_buffer[100];
+int kz_pua_publish_dialoginfo_to_presentity(struct json_object *json_obj)
+{
+	int ret = 1;
+	str from = { 0, 0 }, to = { 0, 0 }, pres = { 0, 0 };
+	str from_user = { 0, 0 }, to_user = { 0, 0 }, pres_user = { 0, 0 };
+	str from_realm = { 0, 0 }, to_realm = { 0, 0 }, pres_realm = { 0, 0 };
+	str from_uri = { 0, 0 }, to_uri = { 0, 0 };
+	str callid = { 0, 0 }, dialogid = { 0, 0 };
+	str fromtag = { 0, 0 }, totag = { 0, 0 };
+	str state = { 0, 0 };
+	str direction = { 0, 0 };
+	str dialoginfo_body = { 0, 0 };
+	int expires = 0;
+	str event = str_init("dialog");
+	int reset = 0;
+	char to_tag_buffer[100];
+	char from_tag_buffer[100];
+	char sender_buf[1024];
+	str sender = { 0, 0 }, etag = { 0, 0 };
+
+	char *body = (char *) pkg_malloc(DIALOGINFO_BODY_BUFFER_SIZE);
+	if (body == NULL) {
+		LM_ERR("Error allocating buffer for publish\n");
+		ret = -1;
+		goto error;
+	}
 
-    char *body = (char *)pkg_malloc(DIALOGINFO_BODY_BUFFER_SIZE);
-    if(body == NULL) {
-    	LM_ERR("Error allocating buffer for publish\n");
-    	ret = -1;
-    	goto error;
-    }
+	json_extract_field(BLF_JSON_PRES, pres);
+	json_extract_field(BLF_JSON_PRES_USER, pres_user);
+	json_extract_field(BLF_JSON_PRES_REALM, pres_realm);
+	json_extract_field(BLF_JSON_FROM, from);
+	json_extract_field(BLF_JSON_FROM_USER, from_user);
+	json_extract_field(BLF_JSON_FROM_REALM, from_realm);
+	json_extract_field(BLF_JSON_FROM_URI, from_uri);
+	json_extract_field(BLF_JSON_TO, to);
+	json_extract_field(BLF_JSON_TO_USER, to_user);
+	json_extract_field(BLF_JSON_TO_REALM, to_realm);
+	json_extract_field(BLF_JSON_TO_URI, to_uri);
+	json_extract_field(BLF_JSON_CALLID, callid);
+	json_extract_field(BLF_JSON_DIALOGID, dialogid);
+	json_extract_field(BLF_JSON_FROMTAG, fromtag);
+	json_extract_field(BLF_JSON_TOTAG, totag);
+	json_extract_field(BLF_JSON_DIRECTION, direction);
+	json_extract_field(BLF_JSON_STATE, state);
+
+	json_extract_field(BLF_JSON_ETAG, etag);
+	json_extract_field(BLF_JSON_SENDER, sender);
+
+	struct json_object* ExpiresObj = kz_json_get_object(json_obj, BLF_JSON_EXPIRES);
+	if (ExpiresObj != NULL) {
+		expires = json_object_get_int(ExpiresObj);
+		if (expires > 0)
+			expires += (int) time(NULL);
+	}
 
+	ExpiresObj = kz_json_get_object(json_obj, "Flush-Level");
+	if (ExpiresObj != NULL) {
+		reset = json_object_get_int(ExpiresObj);
+	}
 
-    json_extract_field(BLF_JSON_PRES, pres);
-    json_extract_field(BLF_JSON_PRES_USER, pres_user);
-    json_extract_field(BLF_JSON_PRES_REALM, pres_realm);
-    json_extract_field(BLF_JSON_FROM, from);
-    json_extract_field(BLF_JSON_FROM_USER, from_user);
-    json_extract_field(BLF_JSON_FROM_REALM, from_realm);
-    json_extract_field(BLF_JSON_FROM_URI, from_uri);
-    json_extract_field(BLF_JSON_TO, to);
-    json_extract_field(BLF_JSON_TO_USER, to_user);
-    json_extract_field(BLF_JSON_TO_REALM, to_realm);
-    json_extract_field(BLF_JSON_TO_URI, to_uri);
-    json_extract_field(BLF_JSON_CALLID, callid);
-    json_extract_field(BLF_JSON_FROMTAG, fromtag);
-    json_extract_field(BLF_JSON_TOTAG, totag);
-    json_extract_field(BLF_JSON_DIRECTION, direction);
-    json_extract_field(BLF_JSON_STATE, state);
-
-    struct json_object* ExpiresObj =  kz_json_get_object(json_obj, BLF_JSON_EXPIRES);
-    if(ExpiresObj != NULL) {
-    	expires = json_object_get_int(ExpiresObj);
-    	if(expires > 0)
-    		expires += (int)time(NULL);
-    }
+	if (!from.len || !to.len || !state.len) {
+		LM_ERR("missing one of From / To / State\n");
+		goto error;
+	}
 
-    ExpiresObj =  kz_json_get_object(json_obj, "Flush-Level");
-    if(ExpiresObj != NULL) {
-    	reset = json_object_get_int(ExpiresObj);
-    }
+	if (!pres.len || !pres_user.len || !pres_realm.len) {
+		pres = from;
+		pres_user = from_user;
+		pres_realm = from_realm;
+	}
 
-    if (!from.len || !to.len || !state.len) {
-    	LM_ERR("missing one of From / To / State\n");
-		goto error;
-    }
+	if (!from_uri.len)
+		from_uri = from;
 
-    if(!pres.len || !pres_user.len || !pres_realm.len) {
-    	pres = from;
-    	pres_user = from_user;
-    	pres_realm = from_realm;
-    }
+	if (!to_uri.len)
+		to_uri = to;
 
-    if(!from_uri.len)
-    	from_uri = from;
+	if (fromtag.len > 0) {
+		fromtag.len = sprintf(from_tag_buffer, LOCAL_TAG, fromtag.len, fromtag.s);
+		fromtag.s = from_tag_buffer;
+	}
 
-    if(!to_uri.len)
-    	to_uri = to;
+	if (totag.len > 0) {
+		totag.len = sprintf(to_tag_buffer, REMOTE_TAG, totag.len, totag.s);
+		totag.s = to_tag_buffer;
+	}
 
-    if(fromtag.len > 0) {
-    	fromtag.len = sprintf(from_tag_buffer, LOCAL_TAG, fromtag.len, fromtag.s);
-    	fromtag.s = from_tag_buffer;
-    }
+	if (dialogid.len == 0) {
+		dialogid = callid;
+	}
 
-    if(totag.len > 0) {
-    	totag.len = sprintf(to_tag_buffer, REMOTE_TAG, totag.len, totag.s);
-    	totag.s = to_tag_buffer;
-    }
+	if (callid.len) {
 
-    if(callid.len) {
-
-    	if(dbk_include_entity) {
-        sprintf(body, DIALOGINFO_BODY,
-        		pres.len, pres.s,
-        		callid.len, callid.s,
-        		callid.len, callid.s,
-        		fromtag.len, fromtag.s,
-        		totag.len, totag.s,
-        		direction.len, direction.s,
-        		state.len, state.s,
-        		from_user.len, from_user.s,
-        		from.len, from.s,
-        		from_uri.len, from_uri.s,
-        		to_user.len, to_user.s,
-        		to.len, to.s,
-        		to_uri.len, to_uri.s
-        		);
-    	} else {
-
-        sprintf(body, DIALOGINFO_BODY_2,
-        		pres.len, pres.s,
-        		callid.len, callid.s,
-        		callid.len, callid.s,
-        		fromtag.len, fromtag.s,
-        		totag.len, totag.s,
-        		direction.len, direction.s,
-        		state.len, state.s,
-        		from_user.len, from_user.s,
-        		from.len, from.s,
-        		to_user.len, to_user.s,
-        		to.len, to.s
-        		);
-    	}
-
-    } else {
-    	sprintf(body, DIALOGINFO_EMPTY_BODY, pres.len, pres.s);
-    }
+		if (dbk_include_entity) {
+			sprintf(body, DIALOGINFO_BODY, pres.len, pres.s, dialogid.len, dialogid.s, callid.len, callid.s, fromtag.len, fromtag.s, totag.len, totag.s, direction.len,
+			        direction.s, state.len, state.s, from_user.len, from_user.s, from.len, from.s, from_uri.len, from_uri.s, to_user.len, to_user.s, to.len, to.s,
+			        to_uri.len, to_uri.s);
+		} else {
+
+			sprintf(body, DIALOGINFO_BODY_2, pres.len, pres.s, dialogid.len, dialogid.s, callid.len, callid.s, fromtag.len, fromtag.s, totag.len, totag.s, direction.len,
+			        direction.s, state.len, state.s, from_user.len, from_user.s, from.len, from.s, to_user.len, to_user.s, to.len, to.s);
+		}
 
-    sprintf(sender_buf, "sip:%s",callid.s);
-    sender.s = sender_buf;
-    sender.len = strlen(sender_buf);
+	} else {
+		sprintf(body, DIALOGINFO_EMPTY_BODY, pres.len, pres.s);
+	}
 
-    dialoginfo_body.s = body;
-    dialoginfo_body.len = strlen(body);
+	if (sender.len == 0) {
+		sprintf(sender_buf, "sip:%s", callid.s);
+		sender.s = sender_buf;
+		sender.len = strlen(sender_buf);
+	}
 
-    if(dbk_pua_mode == 1) {
-    	kz_pua_update_presentity(&event, &pres_realm, &pres_user, &callid, &sender, &dialoginfo_body, expires, reset);
-    }
+	if (etag.len == 0) {
+		etag = callid;
+	}
+
+	dialoginfo_body.s = body;
+	dialoginfo_body.len = strlen(body);
 
- error:
+	kz_pua_update_presentity(&event, &pres_realm, &pres_user, &etag, &sender, &dialoginfo_body, expires, reset);
 
-   if(body)
-	  pkg_free(body);
+	error:
 
+	if (body)
+		pkg_free(body);
 
- return ret;
+	return ret;
 
 }
 
-int kz_pua_publish(struct sip_msg* msg, char *json) {
-    str event_name = { 0, 0 }, event_package = { 0, 0 };
-    struct json_object *json_obj = NULL;
-    int ret = 1;
+int kz_pua_publish(struct sip_msg* msg, char *json)
+{
+	str event_name = { 0, 0 }, event_package = { 0, 0 };
+	struct json_object *json_obj = NULL;
+	int ret = 1;
 
-    if(dbk_pua_mode != 1) {
-    	LM_ERR("pua_mode must be 1 to publish\n");
-    	ret = -1;
-    	goto error;
-    }
+	if (dbk_pua_mode != 1) {
+		LM_ERR("pua_mode must be 1 to publish\n");
+		ret = -1;
+		goto error;
+	}
 
-    /* extract info from json and construct xml */
-    json_obj = kz_json_parse(json);
-    if (json_obj == NULL) {
-    	ret = -1;
-    	goto error;
-    }
+	/* extract info from json and construct xml */
+	json_obj = kz_json_parse(json);
+	if (json_obj == NULL) {
+		ret = -1;
+		goto error;
+	}
 
-    json_extract_field(BLF_JSON_EVENT_NAME, event_name);
-
-    if (event_name.len == 6 && strncmp(event_name.s, "update", 6) == 0) {
-    	json_extract_field(BLF_JSON_EVENT_PKG, event_package);
-    	if (event_package.len == str_event_dialog.len
-    			&& strncmp(event_package.s, str_event_dialog.s, event_package.len) == 0) {
-    		ret = kz_pua_publish_dialoginfo_to_presentity(json_obj);
-    	} else if (event_package.len == str_event_message_summary.len
-    			&& strncmp(event_package.s, str_event_message_summary.s, event_package.len) == 0) {
-    		ret = kz_pua_publish_mwi_to_presentity(json_obj);
-    	} else if (event_package.len == str_event_presence.len
-    			&& strncmp(event_package.s, str_event_presence.s, event_package.len) == 0) {
-    		ret = kz_pua_publish_presence_to_presentity(json_obj);
-    	}
-    }
+	json_extract_field(BLF_JSON_EVENT_NAME, event_name);
 
-error:
-	if(json_obj)
+	if (event_name.len == 6 && strncmp(event_name.s, "update", 6) == 0) {
+		json_extract_field(BLF_JSON_EVENT_PKG, event_package);
+		if (event_package.len == str_event_dialog.len && strncmp(event_package.s, str_event_dialog.s, event_package.len) == 0) {
+			ret = kz_pua_publish_dialoginfo_to_presentity(json_obj);
+		} else if (event_package.len == str_event_message_summary.len && strncmp(event_package.s, str_event_message_summary.s, event_package.len) == 0) {
+			ret = kz_pua_publish_mwi_to_presentity(json_obj);
+		} else if (event_package.len == str_event_presence.len && strncmp(event_package.s, str_event_presence.s, event_package.len) == 0) {
+			ret = kz_pua_publish_presence_to_presentity(json_obj);
+		}
+	}
+
+	error: if (json_obj)
 		json_object_put(json_obj);
 
 	return ret;
 }
 
-int kz_pua_publish_mwi(struct sip_msg* msg, char *json) {
-    struct json_object *json_obj = NULL;
-    int ret = 1;
+int kz_pua_publish_mwi(struct sip_msg* msg, char *json)
+{
+	struct json_object *json_obj = NULL;
+	int ret = 1;
 
-    if(dbk_pua_mode != 1) {
-    	LM_ERR("pua_mode must be 1 to publish\n");
-    	ret = -1;
-    	goto error;
-    }
+	if (dbk_pua_mode != 1) {
+		LM_ERR("pua_mode must be 1 to publish\n");
+		ret = -1;
+		goto error;
+	}
 
-    /* extract info from json and construct xml */
-    json_obj = kz_json_parse(json);
-    if (json_obj == NULL) {
-    	ret = -1;
-    	goto error;
-    }
+	/* extract info from json and construct xml */
+	json_obj = kz_json_parse(json);
+	if (json_obj == NULL) {
+		ret = -1;
+		goto error;
+	}
 
 	ret = kz_pua_publish_mwi_to_presentity(json_obj);
 
-error:
-	if(json_obj)
+	error: if (json_obj)
 		json_object_put(json_obj);
 
 	return ret;
 }
 
-int kz_pua_publish_presence(struct sip_msg* msg, char *json) {
-    struct json_object *json_obj = NULL;
-    int ret = 1;
+int kz_pua_publish_presence(struct sip_msg* msg, char *json)
+{
+	struct json_object *json_obj = NULL;
+	int ret = 1;
 
-    if(dbk_pua_mode != 1) {
-    	LM_ERR("pua_mode must be 1 to publish\n");
-    	ret = -1;
-    	goto error;
-    }
+	if (dbk_pua_mode != 1) {
+		LM_ERR("pua_mode must be 1 to publish\n");
+		ret = -1;
+		goto error;
+	}
 
-    /* extract info from json and construct xml */
-    json_obj = kz_json_parse(json);
-    if (json_obj == NULL) {
-    	ret = -1;
-    	goto error;
-    }
+	/* extract info from json and construct xml */
+	json_obj = kz_json_parse(json);
+	if (json_obj == NULL) {
+		ret = -1;
+		goto error;
+	}
 
 	ret = kz_pua_publish_presence_to_presentity(json_obj);
 
-error:
-	if(json_obj)
+	error: if (json_obj)
 		json_object_put(json_obj);
 
 	return ret;
 }
 
-int kz_pua_publish_dialoginfo(struct sip_msg* msg, char *json) {
-    struct json_object *json_obj = NULL;
-    int ret = 1;
+int kz_pua_publish_dialoginfo(struct sip_msg* msg, char *json)
+{
+	struct json_object *json_obj = NULL;
+	int ret = 1;
 
-    if(dbk_pua_mode != 1) {
-    	LM_ERR("pua_mode must be 1 to publish\n");
-    	ret = -1;
-    	goto error;
-    }
+	if (dbk_pua_mode != 1) {
+		LM_ERR("pua_mode must be 1 to publish\n");
+		ret = -1;
+		goto error;
+	}
 
-    /* extract info from json and construct xml */
-    json_obj = kz_json_parse(json);
-    if (json_obj == NULL) {
-    	ret = -1;
-    	goto error;
-    }
+	/* extract info from json and construct xml */
+	json_obj = kz_json_parse(json);
+	if (json_obj == NULL) {
+		ret = -1;
+		goto error;
+	}
 
 	ret = kz_pua_publish_dialoginfo_to_presentity(json_obj);
 
-error:
-	if(json_obj)
+	error: if (json_obj)
 		json_object_put(json_obj);
 
 	return ret;