diff --git a/web/documentserver-example/php/config.php b/web/documentserver-example/php/config.php
index e8359f4d..b1bd5eed 100644
--- a/web/documentserver-example/php/config.php
+++ b/web/documentserver-example/php/config.php
@@ -4,8 +4,6 @@ $GLOBALS['FILE_SIZE_MAX'] = 5242880;
 $GLOBALS['STORAGE_PATH'] = "";
 $GLOBALS['ALONE'] = FALSE;
 
-$GLOBALS['MODE'] = "";
-
 $GLOBALS['DOC_SERV_VIEWD'] = array(".pdf", ".djvu", ".xps");
 $GLOBALS['DOC_SERV_EDITED'] = array(".docx", ".xlsx", ".csv", ".pptx", ".txt");
 $GLOBALS['DOC_SERV_CONVERT'] = array(".docm", ".doc", ".dotx", ".dotm", ".dot", ".odt", ".fodt", ".ott", ".xlsm", ".xls", ".xltx", ".xltm", ".xlt", ".ods", ".fods", ".ots", ".pptm", ".ppt", ".ppsx", ".ppsm", ".pps", ".potx", ".potm", ".pot", ".odp", ".fodp", ".otp", ".rtf", ".mht", ".html", ".htm", ".epub");
diff --git a/web/documentserver-example/php/css/images/comment-24.png b/web/documentserver-example/php/css/images/comment-24.png
new file mode 100644
index 00000000..447351c3
Binary files /dev/null and b/web/documentserver-example/php/css/images/comment-24.png differ
diff --git a/web/documentserver-example/php/css/images/fill-forms-24.png b/web/documentserver-example/php/css/images/fill-forms-24.png
new file mode 100644
index 00000000..79bd80e2
Binary files /dev/null and b/web/documentserver-example/php/css/images/fill-forms-24.png differ
diff --git a/web/documentserver-example/php/css/images/filter-24.png b/web/documentserver-example/php/css/images/filter-24.png
new file mode 100644
index 00000000..d23567c8
Binary files /dev/null and b/web/documentserver-example/php/css/images/filter-24.png differ
diff --git a/web/documentserver-example/php/css/images/review-24.png b/web/documentserver-example/php/css/images/review-24.png
index 447351c3..2110ad35 100644
Binary files a/web/documentserver-example/php/css/images/review-24.png and b/web/documentserver-example/php/css/images/review-24.png differ
diff --git a/web/documentserver-example/php/doceditor.php b/web/documentserver-example/php/doceditor.php
index 188e95e1..8692fd0e 100644
--- a/web/documentserver-example/php/doceditor.php
+++ b/web/documentserver-example/php/doceditor.php
@@ -59,11 +59,6 @@
     $docKey = getDocEditorKey($filename);
     $filetype = strtolower(pathinfo($filename, PATHINFO_EXTENSION));
 
-    $editorsType = $_GET["type"] == "mobile" ? "mobile" : ($_GET["type"] == "embedded" ? "embedded" : ($_GET["type"] == "desktop" ? "desktop" : ""));
-    if (empty($editorsType)) {
-        $editorsType = "desktop";
-    }
-
     $uid = empty($_GET["user"]) ? "0" : $_GET["user"];
     $uname = "";
     switch ($uid) {
@@ -78,8 +73,12 @@
             break;
     }
 
+    $editorsMode = empty($_GET["action"]) ? "edit" : $_GET["action"];
+    $canEdit = in_array(strtolower('.' . pathinfo($filename, PATHINFO_EXTENSION)), $GLOBALS['DOC_SERV_EDITED']);
+    $mode = $canEdit && $editorsMode != "view" ? "edit" : "view";
+
     $config = [
-        "type" => $editorsType,
+        "type" => empty($_GET["type"]) ? "desktop" : $_GET["type"],
         "documentType" => getDocumentType($filename),
         "document" => [
             "title" => $filename,
@@ -91,13 +90,16 @@
                 "created" => date('d.m.y')
             ],
             "permissions" => [
+                "comment" => $editorsMode != "view" && $editorsMode != "fillForms" && $editorsMode != "embedded",
                 "download" => true,
-                "edit" => in_array(strtolower('.' . pathinfo($filename, PATHINFO_EXTENSION)), $GLOBALS['DOC_SERV_EDITED']) && $_GET["action"] != "review" ? true : false,
-                "review" => true
+                "edit" => $canEdit && ($editorsMode == "edit" || $editorsMode == "filter"),
+                "fillForms" => $editorsMode != "view" && $editorsMode != "comment" && $editorsMode != "embedded",
+                "modifyFilter" => $editorsMode != "filter",
+                "review" => $editorsMode == "edit" || $editorsMode == "review"
             ]
         ],
         "editorConfig" => [
-            "mode" => $GLOBALS['MODE'] != 'view' && in_array(strtolower('.' . pathinfo($filename, PATHINFO_EXTENSION)), $GLOBALS['DOC_SERV_EDITED']) && $_GET["action"] != "view" ? "edit" : "view",
+            "mode" => $mode,
             "lang" => empty($_COOKIE["ulang"]) ? "en" : $_COOKIE["ulang"],
             "callbackUrl" => getCallbackUrl($filename),
             "user" => [
diff --git a/web/documentserver-example/php/index.php b/web/documentserver-example/php/index.php
index d5bf94f3..cd71120b 100644
--- a/web/documentserver-example/php/index.php
+++ b/web/documentserver-example/php/index.php
@@ -177,7 +177,7 @@
                             <thead>
                                 <tr class="tableHeader">
                                     <td class="tableHeaderCell tableHeaderCellFileName">Filename</td>
-                                    <td colspan="3" class="tableHeaderCell contentCells-shift">Editors</td>
+                                    <td colspan="5" class="tableHeaderCell contentCells-shift">Editors</td>
                                     <td colspan="3" class="tableHeaderCell">Viewers</td>
                                 </tr>
                             </thead>
@@ -197,22 +197,40 @@
                                     echo '   <img class="icon-delete" src="css/images/delete-24.png" alt="Delete" title="Delete" /></a>';
                                     echo '  </a>';
                                     echo ' </td>';
+
                                     echo ' <td class="contentCells contentCells-icon">';
-                                    echo '  <a href="doceditor.php?fileID='.urlencode($storeFile->name).'&user='.$user.'&type=desktop" target="_blank">';
+                                    echo '  <a href="doceditor.php?fileID='.urlencode($storeFile->name).'&user='.$user.'&action=edit&type=desktop" target="_blank">';
                                     echo '   <img src="css/images/desktop-24.png" alt="Open in editor for full size screens" title="Open in editor for full size screens" /></a>';
                                     echo '  </a>';
                                     echo ' </td>';
                                     echo ' <td class="contentCells contentCells-icon">';
-                                    echo '  <a href="doceditor.php?fileID='.urlencode($storeFile->name).'&user='.$user.'&type=mobile" target="_blank">';
+                                    echo '  <a href="doceditor.php?fileID='.urlencode($storeFile->name).'&user='.$user.'&action=edit&type=mobile" target="_blank">';
                                     echo '   <img src="css/images/mobile-24.png" alt="Open in editor for mobile devices" title="Open in editor for mobile devices" /></a>';
                                     echo '  </a>';
-                                    echo ' <td class="contentCells contentCells-shift contentCells-icon">';
+                                    echo ' <td class="contentCells contentCells-icon">';
                                     if ($storeFile->documentType == "text") {
                                     echo '  <a href="doceditor.php?fileID='.urlencode($storeFile->name).'&user='.$user.'&action=review&type=desktop" target="_blank">';
                                     echo '   <img src="css/images/review-24.png" alt="Open in editor for review" title="Open in editor for review" /></a>';
                                     echo '  </a>';
+                                    } else if ($storeFile->documentType == "spreadsheet") {
+                                    echo '  <a href="doceditor.php?fileID='.urlencode($storeFile->name).'&user='.$user.'&action=filter&type=desktop" target="_blank">';
+                                    echo '   <img src="css/images/filter-24.png" alt="Open in editor without access to change the filter" title="Open in editor without access to change the filter" /></a>';
+                                    echo '  </a>';
                                     }
                                     echo ' </td>';
+                                    echo ' <td class="contentCells contentCells-icon">';
+                                    echo '  <a href="doceditor.php?fileID='.urlencode($storeFile->name).'&user='.$user.'&action=comment&type=desktop" target="_blank">';
+                                    echo '   <img src="css/images/comment-24.png" alt="Open in editor for comment" title="Open in editor for comment" /></a>';
+                                    echo '  </a>';
+                                    echo ' </td>';
+                                    echo ' <td class="contentCells contentCells-shift contentCells-icon">';
+                                    if ($storeFile->documentType == "text") {
+                                    echo '  <a href="doceditor.php?fileID='.urlencode($storeFile->name).'&user='.$user.'&action=fillForms&type=desktop" target="_blank">';
+                                    echo '   <img src="css/images/fill-forms-24.png" alt="Open in editor for filling in forms" title="Open in editor for filling in forms" /></a>';
+                                    echo '  </a>';
+                                    }
+                                    echo ' </td>';
+
                                     echo ' <td class="contentCells contentCells-icon">';
                                     echo '  <a href="doceditor.php?fileID='.urlencode($storeFile->name).'&user='.$user.'&action=view&type=desktop" target="_blank">';
                                     echo '   <img src="css/images/desktop-24.png" alt="Open in viewer for full size screens" title="Open in viewer for full size screens" /></a>';
@@ -224,7 +242,7 @@
                                     echo '  </a>';
                                     echo ' </td>';
                                     echo ' <td class="contentCells contentCells-icon">';
-                                    echo '  <a href="doceditor.php?fileID='.urlencode($storeFile->name).'&user='.$user.'&type=embedded" target="_blank">';
+                                    echo '  <a href="doceditor.php?fileID='.urlencode($storeFile->name).'&user='.$user.'&action=embedded&type=embedded" target="_blank">';
                                     echo '   <img src="css/images/embeded-24.png" alt="Open in embedded mode" title="Open in embedded mode" /></a>';
                                     echo '  </a>';
                                     echo ' </td>';