Simplified plugin registration and improved registration checks

Change-Id: I60486be70091a5bdc6c2703c73fe6adb52514f32
diff --git a/dev/demo/plugin-server.html b/dev/demo/plugin-server.html
index d91b9e2..15a69d2 100644
--- a/dev/demo/plugin-server.html
+++ b/dev/demo/plugin-server.html
@@ -15,7 +15,7 @@
       <div id="search">
         <ol>
           <li class="active">
-            <div id="container"></div>
+            <div id="match"></div>
             <div id="buttons"></div>
           </li>
         </ol>