diff --git a/shared/main.php b/shared/main.php
index d07b41d..37d2741 100644
--- a/shared/main.php
+++ b/shared/main.php
@@ -16,7 +16,7 @@ limitations under the License.
 */
 
 function uupApiVersion() {
-    return '1.15.7';
+    return '1.15.8';
 }
 
 require_once dirname(__FILE__).'/auths.php';
diff --git a/shared/requests.php b/shared/requests.php
index 7a9892a..84dd6e1 100644
--- a/shared/requests.php
+++ b/shared/requests.php
@@ -28,9 +28,9 @@ function composeDeviceAttributes($flight, $ring, $build, $arch, $sku) {
     }
 
     $attrib = array(
-        'App=WU_OS',
+        'App=WU',
         'AppVer='.$build,
-        'AttrDataVer=45',
+        'AttrDataVer=50',
         'BranchReadinessLevel=CB',
         'CurrentBranch='.$branch,
         'DeviceFamily=Windows.Desktop',
@@ -65,7 +65,7 @@ function composeDeviceAttributes($flight, $ring, $build, $arch, $sku) {
         'WuClientVer='.$build,
     );
 
-    return implode(';', $attrib);
+    return htmlentities('E:'.implode('&', $attrib));
 }
 
 // Returns the most possible branch for selected build
@@ -130,12 +130,12 @@ function composeFetchUpdRequest($device, $encData, $arch, $flight, $ring, $build
     $branch = branchFromBuild($build);
 
     $products = array(
-        'PN=Client.OS.rs2.'.$arch.'&Branch='.$branch.'&PrimaryOSProduct=1&V='.$build,
-        'PN=Windows.Appraiser.'.$arch.'&V='.$build,
-        'PN=Windows.AppraiserData.'.$arch.'&V='.$build,
-        'PN=Windows.EmergencyUpdate.'.$arch.'&V='.$build,
-        'PN=Windows.OOBE.'.$arch.'&V='.$build,
-        'PN=Windows.UpdateStackPackage.'.$arch.'&Name=Update Stack Package&V='.$build,
+        'PN=Client.OS.rs2.'.$arch.'&Branch='.$branch.'&PrimaryOSProduct=1&V='.$build,
+        'PN=Windows.Appraiser.'.$arch.'&V='.$build,
+        'PN=Windows.AppraiserData.'.$arch.'&V='.$build,
+        'PN=Windows.EmergencyUpdate.'.$arch.'&V='.$build,
+        'PN=Windows.OOBE.'.$arch.'&V='.$build,
+        'PN=Windows.UpdateStackPackage.'.$arch.'&Name=Update Stack Package&V='.$build,
     );
 
     $callerAttrib = array(
@@ -145,8 +145,8 @@ function composeFetchUpdRequest($device, $encData, $arch, $flight, $ring, $build
         'IsSeeker=1',
     );
 
-    $products = implode(';', $products);
-    $callerAttrib = 'E:'.implode('&', $callerAttrib);
+    $products = htmlentities(implode(';', $products));
+    $callerAttrib = htmlentities('E:'.implode('&', $callerAttrib));
 
     $deviceAttributes = composeDeviceAttributes(
         $flight,