diff --git a/extension/Documentation/UsersManual/Index.rst b/extension/Documentation/UsersManual/Index.rst
index f037889ab370b45d3d191088442432b8a02979a7..2ffdedc4ad626c560dd21b2c9fece565cd60f186 100644
--- a/extension/Documentation/UsersManual/Index.rst
+++ b/extension/Documentation/UsersManual/Index.rst
@@ -429,9 +429,9 @@ Store: *VARS* - V
  +-------------------------+--------------------------------------------------------------------------------------------------------------------------------------------+
  | slaveId                 | see *FormElement* `action`                                                                                                                 |
  +-------------------------+--------------------------------------------------------------------------------------------------------------------------------------------+
- | filename                | Original filename of an uploaded file  via an 'upload'-FormElement.                                                                        |
+ | filename                | Original filename of an uploaded file via an 'upload'-FormElement. Valid only during processing of the current 'upload'-formElement.       |
  +-------------------------+--------------------------------------------------------------------------------------------------------------------------------------------+
- | fileDestinaton          | Destination (path & filename) for an uploaded file. Defined in an 'upload'-FormElement.parameter.                                          |
+ | fileDestinaton          | Destination (path & filename) for an uploaded file. Defined in an 'upload'-FormElement.parameter. Valid: same as 'filename'.               |
  +-------------------------+--------------------------------------------------------------------------------------------------------------------------------------------+
 
 
@@ -1076,9 +1076,11 @@ Type: datetime
 
 Type: extra
 ^^^^^^^^^^^
+
 * Element is not shown in the browser.
 * The element can be used to define / precalculate values for a column, which do not already exist as a native *FormElement*.
-* The element is build /computed on form load.
+* The element is build / computed on form load and saved alongside with the SIP parameter of the current form.
+* Access the value without specifying any store (default store priority is sufficient).
 
 Type: text
 ^^^^^^^^^^
diff --git a/extension/qfq/qfq/report/Link.php b/extension/qfq/qfq/report/Link.php
index 9a39d2ded05268bebc4bab412aba939b59cdaee4..0126d8f4f95fc8bf4c7975bf02ed78cded27bbf8 100644
--- a/extension/qfq/qfq/report/Link.php
+++ b/extension/qfq/qfq/report/Link.php
@@ -382,13 +382,14 @@ class Link {
     }
 
     /**
-     * @param $str
+     * @param string $str
      * @param array $tokenGiven
      * @return array
      * @throws UserReportException
      */
     private function fillParameter($str, array &$tokenGiven) {
 
+        // define all possible vars: no more isset()
         $vars = $this->initVars();
         $flagArray = array();
 
@@ -398,6 +399,7 @@ class Link {
         // Parse all parameter, fill variables
         foreach ($param as $item) {
 
+            // Skip empty entries
             if ($item === '') {
                 continue;
             }
@@ -407,6 +409,7 @@ class Link {
             $key = isset($arr[0]) ? $arr[0] : '';
             $value = isset($arr[1]) ? $arr[1] : '';
 
+            // Bookkeeping defined parameter.
             if (isset($tokenGiven[$key])) {
                 throw new UserReportException ("Multiple definitions for key '$key'", ERROR_MULTIPLE_DEFINITION);
             }