diff --git a/app/src/Pages/PageController.php b/app/src/Pages/PageController.php
index 5e564ba..96ad04b 100644
--- a/app/src/Pages/PageController.php
+++ b/app/src/Pages/PageController.php
@@ -146,7 +146,12 @@ class PageController extends ContentController
         );
 
         foreach ($elements as $element) {
-            $page = Page::get()->filter('ElementalAreaID', $element->getField('ParentID'))->first();
+            if (!is_a($element, \DNADesign\Elemental\Models\BaseElement::class)
+                && !$element->hasMethod('getPage')) {
+                continue;
+            }
+
+            $page = $element->getPage();
             if (! $page) {
                 continue;
             }
diff --git a/webpack.config.js b/webpack.config.js
index b4a4c7f..9925276 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -164,7 +164,7 @@ minimizers.push(
             reserved: ['$', 'jQuery', 'jquery'],
           },
         output: {
-            ecma: 5,
+            ecma: 6,
             comments: false,
             // Turned on because emoji and regex is not minified properly using default
             // https://github.com/facebook/create-react-app/issues/2488