diff --git a/src/QueryEditor.tsx b/src/QueryEditor.tsx
index e57270e..f400e46 100644
--- a/src/QueryEditor.tsx
+++ b/src/QueryEditor.tsx
@@ -158,7 +158,7 @@ export class QueryEditor extends PureComponent<Props> {
               grow
             >
               <QueryField
-                placeholder={'Enter a Cassandra query'}
+                placeholder={'Enter a CQL query'}
                 portalOrigin="cassandra"
                 onChange={this.onQueryTextChange}
                 onBlur={this.props.onRunQuery}
@@ -179,6 +179,7 @@ export class QueryEditor extends PureComponent<Props> {
                   onChange={this.onKeyspaceChange}
                   spellCheck={false}
                   onBlur={this.onRunQuery}
+                  required
                   width={90}
                 /> */}
                 <Select
@@ -203,6 +204,7 @@ export class QueryEditor extends PureComponent<Props> {
                   placeholder="table name"
                   onChange={this.onTableChange}
                   onBlur={this.onRunQuery}
+                  required
                   width={90}
                 /> */}
                 <Select
@@ -230,6 +232,7 @@ export class QueryEditor extends PureComponent<Props> {
                   onChange={this.onTimeColumnChange}
                   onBlur={this.onRunQuery}
                   width={90}
+                  required
                 /> */}
                 <Select
                   allowCustomValue={true}
@@ -257,6 +260,7 @@ export class QueryEditor extends PureComponent<Props> {
                   onChange={this.onValueColumnChange}
                   onBlur={this.onRunQuery}
                   width={90}
+                  required
                 /> */}
                 <Select
                   allowCustomValue={true}
@@ -284,6 +288,7 @@ export class QueryEditor extends PureComponent<Props> {
                   onChange={this.onIDColumnChange}
                   onBlur={this.onRunQuery}
                   width={90}
+                  required
                 /> */}
                 <Select
                   allowCustomValue={true}
@@ -313,6 +318,7 @@ export class QueryEditor extends PureComponent<Props> {
                     this.onRunQuery(this.props);
                   }}
                   width={90}
+                  required
                 />
               </InlineField>
             </InlineFieldRow>
diff --git a/src/datasource.ts b/src/datasource.ts
index fd3e873..4b7f2b8 100644
--- a/src/datasource.ts
+++ b/src/datasource.ts
@@ -13,7 +13,6 @@ export interface CassandraDataSourceOptions extends DataSourceJsonData {
   caPath: string;
   useCustomTLS: boolean;
   timeout: number;
-
   allowInsecureTLS: boolean;
 }
 
@@ -30,9 +29,34 @@ export class CassandraDatasource extends DataSourceWithBackend<CassandraQuery, C
   }
 
   query(options: DataQueryRequest<CassandraQuery>): Observable<DataQueryResponse> {
+    if (this.isEditorMode(options)) {
+      if (!this.isEditorCompleted(options))
+        throw new Error("Skipping query execution while not all editor fields are filled");
+    } else {
+      if (!this.isConfiguratorCompleted(options))
+        throw new Error("Skipping query execution while not all configurator fields are filled");
+    }
+    
     return super.query(this.buildQueryParameters(options));
   }
 
+  isEditorMode (options): boolean {
+    return !options.targets[0].rawQuery;
+  }
+
+  isEditorCompleted(options): boolean {
+    return options.targets[0].keyspace && 
+           options.targets[0].table &&
+           options.targets[0].columnTime &&
+           options.targets[0].columnValue &&
+           options.targets[0].columnId &&
+           options.targets[0].valueId;
+  }
+  
+  isConfiguratorCompleted(options): boolean {
+    return  Boolean(options.targets[0].target);
+  }
+
   async getKeyspaces(): Promise<string[]> {
     return this.getResource('keyspaces');
   }