diff --git a/plugins/rest/lib/rest/route.php b/plugins/rest/lib/rest/route.php
index 01dcbe52..742f93d0 100644
--- a/plugins/rest/lib/rest/route.php
+++ b/plugins/rest/lib/rest/route.php
@@ -186,7 +186,7 @@ public function handleRequest(array $paths, array $get)
                         $id = $path;
                         $id_column = 'id';
                         if ('' != $query->getTableAlias()) {
-                            $id_column = $query->getTableAlias().'.id';
+                            $id_column = $query->getTableAlias() . '.id';
                         }
 
                         $query
@@ -224,7 +224,7 @@ public function handleRequest(array $paths, array $get)
 
                         $instance_data = $this->getInstanceData(
                             $instance,
-                            array_merge($paths, [$instance->getId()])
+                            array_merge($paths, [$instance->getId()]),
                         );
                         if (is_callable($this->getItemFunc)) {
                             $instance_data = call_user_func($this->getItemFunc, $this, $instance_data);
@@ -259,18 +259,18 @@ public function handleRequest(array $paths, array $get)
                         $links['self'] = rex_yform_rest::getLinkByPath($this, $linkParams);
                         $links['first'] = rex_yform_rest::getLinkByPath($this, array_merge(
                             $linkParams,
-                            ['page' => 1]
+                            ['page' => 1],
                         ));
                         if (($currentPage - 1) > 0) {
                             $links['prev'] = rex_yform_rest::getLinkByPath($this, array_merge(
                                 $linkParams,
-                                ['page' => ($currentPage - 1)]
+                                ['page' => ($currentPage - 1)],
                             ));
                         }
                         if (($currentPage * $per_page) < $itemsAll) {
                             $links['next'] = rex_yform_rest::getLinkByPath($this, array_merge(
                                 $linkParams,
-                                ['page' => ($currentPage + 1)]
+                                ['page' => ($currentPage + 1)],
                             ));
                         }
 
@@ -286,7 +286,7 @@ public function handleRequest(array $paths, array $get)
                     } else {
                         $data = $this->getInstanceData(
                             $instance,
-                            array_merge($paths)
+                            array_merge($paths),
                         );
                         if (is_callable($this->getItemFunc)) {
                             $data = call_user_func($this->getItemFunc, $this, $data);
@@ -302,7 +302,7 @@ public function handleRequest(array $paths, array $get)
 
                 break;
 
-            // ----- /END GET
+                // ----- /END GET
 
             case 'post':
                 $instance = $table->createDataset();
@@ -575,7 +575,7 @@ private function filterFieldsByInclude(array $fields, array $parents = []): arra
 
         $newFields = [];
         foreach ($fields as $key => $field) {
-            $compareKey = 0 == count($parents) ? $key : implode('.', $parents).'.'.$key;
+            $compareKey = 0 == count($parents) ? $key : implode('.', $parents) . '.' . $key;
             if (in_array($compareKey, $this->getIncludes(), true)) {
                 $newFields[$key] = $field;
             }
@@ -613,7 +613,7 @@ public function getInstanceRelationships(rex_yform_manager_dataset $instance, $p
                         $relationInstance,
                         array_merge($paths, [$field->getName(), $relationInstance->getId()]),
                         $onlyId,
-                        $fieldParents
+                        $fieldParents,
                     );
                 }
                 $return[$field->getName()] = [
diff --git a/ytemplates/bootstrap/errors.tpl.php b/ytemplates/bootstrap/errors.tpl.php
index 4a91eed0..cf2263ed 100644
--- a/ytemplates/bootstrap/errors.tpl.php
+++ b/ytemplates/bootstrap/errors.tpl.php
@@ -9,7 +9,7 @@
 
 <?php
 if ($this->objparams['warning_messages'] || $this->objparams['unique_error']):
-    if ($this->objparams['Error-occured']): 
+    if ($this->objparams['Error-occured']):
         if($this->objparams['warning_intro']) { ?>
             <p><?= $this->objparams['warning_intro'] ?></p>
         <?php } ?>