Updated/fixed queries and rmap
diff --git a/queries/tigerstripe-annotation.cquery b/queries/tigerstripe-annotation.cquery
index 9b7ab54..e68f116 100644
--- a/queries/tigerstripe-annotation.cquery
+++ b/queries/tigerstripe-annotation.cquery
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <cq:componentQuery xmlns:cq="http://www.eclipse.org/buckminster/CQuery-1.0" resourceMap="http://www.eclipse.org/tigerstripe/queries/tigerstripe.rmap">
-    <cq:rootRequest name="org.eclipse.tigerstripe.base" componentType="eclipse.feature"/>
+    <cq:rootRequest name="org.eclipse.tigerstripe.annotation.feature" componentType="eclipse.feature"/>
 </cq:componentQuery>
diff --git a/queries/tigerstripe-base.cquery b/queries/tigerstripe-base.cquery
index e68f116..9b7ab54 100644
--- a/queries/tigerstripe-base.cquery
+++ b/queries/tigerstripe-base.cquery
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <cq:componentQuery xmlns:cq="http://www.eclipse.org/buckminster/CQuery-1.0" resourceMap="http://www.eclipse.org/tigerstripe/queries/tigerstripe.rmap">
-    <cq:rootRequest name="org.eclipse.tigerstripe.annotation.feature" componentType="eclipse.feature"/>
+    <cq:rootRequest name="org.eclipse.tigerstripe.base" componentType="eclipse.feature"/>
 </cq:componentQuery>
diff --git a/queries/tigerstripe.rmap b/queries/tigerstripe.rmap
index aa23d22..521bc14 100644
--- a/queries/tigerstripe.rmap
+++ b/queries/tigerstripe.rmap
@@ -20,8 +20,8 @@
 		</provider>
 	</searchPath>
 
+	<locator searchPathRef="tigerstripe-plugins" pattern="^org\.eclipse\.tigerstripe(\..*)*" />
 	<locator searchPathRef="tigerstripe-features" pattern="^org\.eclipse\.tigerstripe\.base" />
 	<locator searchPathRef="tigerstripe-features" pattern="^org\.eclipse\.tigerstripe\.annotation\.feature" />
 	<locator searchPathRef="tigerstripe-features" pattern="^org\.eclipse\.tigerstripe\.workbench" />
-	<locator searchPathRef="tigerstripe-plugins" pattern="^org\.eclipse\.tigerstripe(\..*)?" />
 </rmap>
\ No newline at end of file