diff -r fce676654ae4 libpw/PW/PayloadBuilder/AmazonPayloadBuilder.php
--- a/libpw/PW/PayloadBuilder/AmazonPayloadBuilder.php	Thu Apr 30 18:38:00 2015 +0600
+++ b/libpw/PW/PayloadBuilder/AmazonPayloadBuilder.php	Thu Apr 30 20:50:00 2015 +0600
@@ -35,16 +35,15 @@
 			$data['u'] = $message['msg_properties']['userdata'];
 		}
 
-		if (!empty($message['pageId'])) {
-			$data['h'] = $message['pageId'];
+		if (!empty($message['msg_properties']['pageId'])) {
+			$data['h'] = $message['msg_properties']['pageId'];
 		}
 
-		if (!empty($message['richPageId'])) {
-			$data['j'] = $message['richPageId'];
-		}
+		if (!empty($message['msg_properties']['richPageId']))
+			$data['j'] = $message['msg_properties']['richPageId'];
 
-		if (!empty($message['url'])) {
-			$data['l'] = $message['url'];
+		if (!empty($message['msg_properties']['url'])) {
+			$data['l'] = $message['msg_properties']['url'];
 		}
 				
 		if (!empty($message['msg_properties']['remote_page'])) {
diff -r fce676654ae4 libpw/PW/PayloadBuilder/AndroidPayloadBuilder.php
--- a/libpw/PW/PayloadBuilder/AndroidPayloadBuilder.php	Thu Apr 30 18:38:00 2015 +0600
+++ b/libpw/PW/PayloadBuilder/AndroidPayloadBuilder.php	Thu Apr 30 20:50:00 2015 +0600
@@ -47,8 +47,8 @@
 				if (!empty($message['msg_properties']['userdata']))
 					$data['u'] = $message['msg_properties']['userdata'];
 
-				if (!empty($message['pageId']))
-					$data['h'] = $message['pageId'];
+				if (!empty($message['msg_properties']['pageId']))
+					$data['h'] = $message['msg_properties']['pageId'];
 
 				if (!empty($message['msg_properties']['pushwoosher_feed']))
 					$data['f'] = $message['msg_properties']['pushwoosher_feed'];
@@ -56,8 +56,8 @@
 				if (!empty($message['msg_properties']['richPageId']))
 					$data['j'] = $message['msg_properties']['richPageId'];
 
-				if (!empty($message['url']))
-					$data['l'] = $message['url'];
+				if (!empty($message['msg_properties']['url']))
+					$data['l'] = $message['msg_properties']['url'];
 				
 				if (!empty($message['msg_properties']['remote_page']))
 					$data['r'] = $message['msg_properties']['remote_page'];
diff -r fce676654ae4 libpw/PW/PayloadBuilder/ChromePayloadBuilder.php
--- a/libpw/PW/PayloadBuilder/ChromePayloadBuilder.php	Thu Apr 30 18:38:00 2015 +0600
+++ b/libpw/PW/PayloadBuilder/ChromePayloadBuilder.php	Thu Apr 30 20:50:00 2015 +0600
@@ -31,11 +31,11 @@
 		if (!empty($message['msg_properties']['userdata']))
 			$data['u'] = $message['msg_properties']['userdata'];
 
-		if (!empty($message['pageId']))
-			$data['h'] = $message['pageId'];
+		if (!empty($message['msg_properties']['pageId']))
+			$data['h'] = $message['msg_properties']['pageId'];
 
-		if (!empty($message['url']))
-			$data['l'] = $message['url'];
+		if (!empty($message['msg_properties']['url']))
+			$data['l'] = $message['msg_properties']['url'];
 
 		if (!empty($message['msg_properties']['message_hash']))
 			$data['p'] = $message['msg_properties']['message_hash'];
diff -r fce676654ae4 libpw/PW/PayloadBuilder/IosPayloadBuilder.php
--- a/libpw/PW/PayloadBuilder/IosPayloadBuilder.php	Thu Apr 30 18:38:00 2015 +0600
+++ b/libpw/PW/PayloadBuilder/IosPayloadBuilder.php	Thu Apr 30 20:50:00 2015 +0600
@@ -45,8 +45,8 @@
 				if (!empty($message['msg_properties']['ios_category_id']))
 					$data['aps']['category'] = $message['msg_properties']['ios_category_id'];
 
-				if (!empty($message['url']))
-					$data['l'] = $message['url'];
+				if (!empty($message['msg_properties']['url']))
+					$data['l'] = $message['msg_properties']['url'];
 				
 				if (!empty($message['msg_properties']['remote_page']))
 					$data['r'] = $message['msg_properties']['remote_page'];
@@ -54,8 +54,8 @@
 				if (!empty($message['msg_properties']['userdata']))
 					$data['u'] = $message['msg_properties']['userdata'];
 
-				if (!empty($message['pageId']))
-					$data['h'] = $message['pageId'];
+				if (!empty($message['msg_properties']['pageId']))
+					$data['h'] = $message['msg_properties']['pageId'];
 
 				if (!empty($message['msg_properties']['richPageId']))
 					$data['j'] = $message['msg_properties']['richPageId'];
diff -r fce676654ae4 libpw/PW/PayloadBuilder/OSXPayloadBuilder.php
--- a/libpw/PW/PayloadBuilder/OSXPayloadBuilder.php	Thu Apr 30 18:38:00 2015 +0600
+++ b/libpw/PW/PayloadBuilder/OSXPayloadBuilder.php	Thu Apr 30 20:50:00 2015 +0600
@@ -40,20 +40,20 @@
 			$data['aps']['sound'] = $message['msg_properties']['mac_sound'];
 		}
 
-		if (!empty($message['pageId'])) {
-			$data['h'] = $message['pageId'];
+		if (!empty($message['msg_properties']['pageId'])) {
+			$data['h'] = $message['msg_properties']['pageId'];
 		}
 
-		if (!empty($message['richPageId'])) {
-			$data['j'] = $message['richPageId'];
+		if (!empty($message['msg_properties']['richPageId'])) {
+			$data['j'] = $message['msg_properties']['richPageId'];
 		}
 
 		if (!empty($message['msg_properties']['userdata'])) {
 			$data['u'] = $message['msg_properties']['userdata'];
 		}
 
-		if (!empty($message['url'])) {
-			$data['l'] = $message['url'];
+		if (!empty($message['msg_properties']['url'])) {
+			$data['l'] = $message['msg_properties']['url'];
 		}
 
 		if (!empty($message['msg_properties']['message_hash']))