diff --git a/zero.Core/Database/ZeroStore.cs b/zero.Core/Database/ZeroStore.cs
index c411bb89..76ea4623 100644
--- a/zero.Core/Database/ZeroStore.cs
+++ b/zero.Core/Database/ZeroStore.cs
@@ -125,7 +125,7 @@ namespace zero.Core.Database
         QueryParameters = parameters
       }, new QueryOperationOptions { AllowStale = true });
 
-      Operation operation = await GetOperationExecutor(database).SendAsync(operationQuery);
+      Operation operation = await GetOperationExecutor(database ?? ResolvedDatabase).SendAsync(operationQuery);
 
       await operation.WaitForCompletionAsync();
     }
diff --git a/zero.Web.UI/app/components/all.js b/zero.Web.UI/app/components/all.js
index 838218a1..ca6c686a 100644
--- a/zero.Web.UI/app/components/all.js
+++ b/zero.Web.UI/app/components/all.js
@@ -64,6 +64,7 @@ import uiPermissions from './permissions.vue';
 import uiRevisions from './revisions.vue';
 import uiIcon from './icon.vue';
 import uiLocalize from './localize.vue';
+import uiText from './text.vue';
 
 import uiEditor from '../editor/editor.vue';
 import uiEditorInfos from '../editor/editor-infos.vue';
@@ -135,6 +136,7 @@ export default {
   uiRevisions,
   uiIcon,
   uiLocalize,
+  uiText,
 
   uiEditor,
   uiEditorInfos
diff --git a/zero.Web.UI/app/components/text.vue b/zero.Web.UI/app/components/text.vue
new file mode 100644
index 00000000..9906ee36
--- /dev/null
+++ b/zero.Web.UI/app/components/text.vue
@@ -0,0 +1,36 @@
+<template>
+  <div class="ui-text" @click="opened = !opened" :class="{ 'is-open': opened }" :style="{'-webkit-line-clamp': maxLines > 0 ? maxLines : null }"><slot></slot></div>
+</template>
+
+<script>
+  export default {
+    name: 'uiText',
+
+    props: {
+      maxLines: {
+        type: Number
+      }
+    },
+
+    data: () => ({
+      opened: false
+    })
+  }
+</script>
+
+<style lang="scss">
+  .ui-text
+  {
+    line-height: 1.5;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: normal;
+
+    &.is-open
+    {
+      -webkit-line-clamp: inherit !important;
+    }
+  }
+</style>
\ No newline at end of file