diff --git a/src/ActionExecutor/Form.php b/src/ActionExecutor/Form.php
index 2d3a4a53d8..a40167cb7c 100644
--- a/src/ActionExecutor/Form.php
+++ b/src/ActionExecutor/Form.php
@@ -53,13 +53,6 @@ public function initPreview()
      */
     protected function getModelFields(Model $model)
     {
-        $fields = [];
-        foreach ($model->getFields() as $f) {
-            if ($f->isEditable() || $f->isVisible()) {
-                $fields[] = $f->short_name;
-            }
-        }
-
-        return $fields;
+        return array_keys($model->getFields(['editable', 'visible']));
     }
 }
diff --git a/src/Card.php b/src/Card.php
index 016f942e1e..abe6ed2bed 100644
--- a/src/Card.php
+++ b/src/Card.php
@@ -209,7 +209,7 @@ public function setModel(Model $m, $fields = null)
         }
 
         if (!$fields) {
-            $fields = array_keys($this->model->getFields('visible'));
+            $fields = array_keys($this->model->getFields(['editable', 'visible']));
         }
 
         $this->setDataId($this->model->get($this->model->id_field));
diff --git a/src/CardSection.php b/src/CardSection.php
index fa485d320c..51b4a32833 100644
--- a/src/CardSection.php
+++ b/src/CardSection.php
@@ -36,7 +36,7 @@ public function addDescription($description)
     {
         $view = null;
 
-        if (is_string($description)) {
+        if (is_scalar($description)) {
             $view = $this->add(new View([$description, 'class' => ['description']]));
         } elseif ($description instanceof View) {
             $view = $this->add($description)->addClass('description');