diff --git a/app/webpack.config.js b/app/webpack.config.js
index 8101f54d..1fea6f38 100644
--- a/app/webpack.config.js
+++ b/app/webpack.config.js
@@ -5,7 +5,7 @@ module.exports = {
   name: 'terminus',
   target: 'node',
   entry: {
-    'index.ignore': 'file-loader?name=index.html!pug-html-loader!' + path.resolve(__dirname, './index.pug'),
+    'index.ignore': 'file-loader?name=index.html!val-loader!pug-html-loader!' + path.resolve(__dirname, './index.pug'),
     'preload': path.resolve(__dirname, 'src/entry.preload.ts'),
     'bundle': path.resolve(__dirname, 'src/entry.ts'),
   },
diff --git a/terminus-plugin-manager/src/services/pluginManager.service.ts b/terminus-plugin-manager/src/services/pluginManager.service.ts
index 1e34e556..952c9dc6 100644
--- a/terminus-plugin-manager/src/services/pluginManager.service.ts
+++ b/terminus-plugin-manager/src/services/pluginManager.service.ts
@@ -5,6 +5,7 @@ import { exec } from 'mz/child_process'
 import axios from 'axios'
 
 const NAME_PREFIX = 'terminus-'
+const KEYWORD = 'terminus-plugin'
 
 export interface IPluginInfo {
     name: string
@@ -42,7 +43,7 @@ export class PluginManagerService {
     listAvailable (query?: string): Observable<IPluginInfo[]> {
         return Observable
             .fromPromise(
-                axios.get(`https://www.npmjs.com/-/search?text=${NAME_PREFIX}+${encodeURIComponent(query || '')}&from=0&size=1000`)
+                axios.get(`https://www.npmjs.com/-/search?text=keywords:${KEYWORD}+${encodeURIComponent(query || '')}&from=0&size=1000`)
             )
             .map(response => response.data.objects.map(item => ({
                 name: item.package.name.substring(NAME_PREFIX.length),