diff --git a/src/DataviewSuggester.ts b/src/DataviewSuggester.ts
index 96d4e14..6ea6eeb 100644
--- a/src/DataviewSuggester.ts
+++ b/src/DataviewSuggester.ts
@@ -15,7 +15,6 @@ import { getAPI, DataviewApi } from "obsidian-dataview";
 export class DataviewSuggester extends EditorSuggest<String> {
     maxSuggestions: number;
     searcher: uFuzzy;
-    dataviewApi: DataviewApi;
 
     initialized: boolean = false;
     suggestionsList: string[] = [];
@@ -34,7 +33,6 @@ export class DataviewSuggester extends EditorSuggest<String> {
             intraMode: singleErrorMode ? 1 : 0,
             intraIns: allowExtraChars ? 1 : 0,
         });
-        this.dataviewApi = getAPI(plugin.app);
     }
 
     onTrigger(cursor: EditorPosition, editor: Editor, file: TFile): EditorSuggestTriggerInfo | null {
@@ -93,7 +91,7 @@ export class DataviewSuggester extends EditorSuggest<String> {
     // possible types: update, rename, delete. rename has oldPath
     public onDataviewMetadataChange(type: string, file: TFile, oldPath?: string) {
         if (!this.initialized) {
-            console.log("Dataview Autocompletion index not ready yet. Skipping index update");
+            // console.warn("Dataview Autocompletion index not ready yet. Skipping index update");
             return;
         }
         this.updateIndex(type, file, oldPath);
@@ -104,21 +102,19 @@ export class DataviewSuggester extends EditorSuggest<String> {
      * returns the composite value in format "key:: value"
      */
     formatCompositeValue(key: string, value: any): string {
+        const dataviewAPI = getAPI(this.app);
+
         let stringValue: string;
 
         // If the value is a string, number or boolean, we can simply convert it to a string
         if (typeof value === "string" || typeof value === "number" || typeof value === "boolean") {
             stringValue = value.toString();
-        } else if (
-            this.dataviewApi.value.typeOf(value) === "link" &&
-            value.type === "file" &&
-            value.display !== undefined
-        ) {
+        } else if (dataviewAPI.value.typeOf(value) === "link" && value.type === "file" && value.display !== undefined) {
             // value.toString always adds a display value to wiki-style links.
             // parse wiki-style links without display value manually here to prevent this from happening for [[filename]]
             stringValue = `[[${value.path.split("/").pop().replace(".md", "")}]]`;
         } else {
-            stringValue = this.dataviewApi.value.toString(value);
+            stringValue = dataviewAPI.value.toString(value);
         }
 
         return `${key}:: ${stringValue}`;
@@ -127,15 +123,22 @@ export class DataviewSuggester extends EditorSuggest<String> {
     buildNewIndex() {
         console.log("Begin Rebuilding dataview suggestion index");
         const startTime = performance.now();
+        const dataviewApi = getAPI(this.app);
 
         const newSuggestions: string[] = [];
         const newSuggestionsRefs: { [key: string]: string[] } = {};
         const newSuggestionsRefCount: { [key: string]: number } = {};
 
-        for (const page of this.dataviewApi.index.pages) {
+        const files = this.app.vault.getFiles();
+        for (const file of files) {
+            const page = dataviewApi.page(file.path);
+            const fields = Object.keys(page)
+                .filter((k) => k !== "file")
+                .map((k) => [k, page[k]]);
+
             const pageRefs = [];
 
-            for (let [key, val] of page[1].fields) {
+            for (let [key, val] of fields) {
                 // fields can be a single value or a dict, so we need to handle both
                 let arrayVal;
                 if (!Array.isArray(val)) {
@@ -162,7 +165,7 @@ export class DataviewSuggester extends EditorSuggest<String> {
                     }
                 }
             }
-            newSuggestionsRefs[page[0]] = pageRefs;
+            newSuggestionsRefs[file.path] = pageRefs;
         }
 
         // replace old index
@@ -181,7 +184,7 @@ export class DataviewSuggester extends EditorSuggest<String> {
         if (type === "update") {
             const updateCompositeValues = [];
 
-            const page = this.dataviewApi.page(file.path);
+            const page = getAPI(this.app).page(file.path);
             const fields = Object.keys(page)
                 .filter((k) => k !== "file")
                 .map((k) => [k, page[k]]);
@@ -202,7 +205,6 @@ export class DataviewSuggester extends EditorSuggest<String> {
                         updateCompositeValues.push(compositeValue);
                     }
                 }
-
                 for (const compositeValue of this.suggestionsRefs[file.path]) {
                     if (updateCompositeValues.indexOf(compositeValue) === -1) {
                         // delete value
diff --git a/src/main.ts b/src/main.ts
index 6e1549c..c63b1fe 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,5 +1,6 @@
 import { App, Plugin, PluginSettingTab, Setting, TFile } from "obsidian";
 import { DataviewSuggester } from "./DataviewSuggester";
+import { getAPI } from "obsidian-dataview";
 
 interface DataviewAutocompleteSettings {
     // mySetting: string;
@@ -16,10 +17,6 @@ export default class DataviewAutocompletePlugin extends Plugin {
     async onload() {
         await this.loadSettings();
 
-        // register suggester
-        this.suggester = new DataviewSuggester(this, 10, true, true);
-        this.registerEditorSuggest(this.suggester);
-
         this.registerEvent(
             // @ts-ignore
             this.app.metadataCache.on("dataview:index-ready", () => {
@@ -36,6 +33,18 @@ export default class DataviewAutocompletePlugin extends Plugin {
                 },
             ),
         );
+
+        this.app.workspace.onLayoutReady(() => {
+            // @ts-ignore
+            if (!Object.keys(this.app.plugins.plugins).includes("dataview")) {
+                console.warn("Dataview plugin not installed. Dataview Autocompletion plugin will not work.");
+            } else {
+                // register suggester, requires dataview to be loaded first.
+                console.log("Registering dataview autocompletion suggester");
+                this.suggester = new DataviewSuggester(this, 10, true, true);
+                this.registerEditorSuggest(this.suggester);
+            }
+        });
     }
 
     onunload() {}
diff --git a/src/trigger.ts b/src/trigger.ts
index 44e2683..f21ed26 100644
--- a/src/trigger.ts
+++ b/src/trigger.ts
@@ -53,7 +53,6 @@ export function getTriggerText(line: string, cursorPos: number): [string, number
 function getTriggerTextFromRegex(line: string, cursorPos: number, regex: RegExp): [string, number, number] | null {
     let matches = Array.from(line.matchAll(regex));
     for (const match of matches) {
-        console.warn(match);
         if (match.index === undefined) {
             continue;
         }