diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/IssueQuery.java b/server/sonar-server/src/main/java/org/sonar/server/issue/IssueQuery.java
index 8bb030b36286..553239d0564f 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/IssueQuery.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/IssueQuery.java
@@ -58,7 +58,7 @@ public class IssueQuery {
   private final Collection<String> statuses;
   private final Collection<String> resolutions;
   private final Collection<String> components;
-  private final Collection<String> componentRoots;
+  private final Collection<String> modules;
   private final Collection<String> projects;
   private final Collection<RuleKey> rules;
   private final Collection<String> actionPlans;
@@ -84,7 +84,7 @@ private IssueQuery(Builder builder) {
     this.statuses = defaultCollection(builder.statuses);
     this.resolutions = defaultCollection(builder.resolutions);
     this.components = defaultCollection(builder.components);
-    this.componentRoots = defaultCollection(builder.componentRoots);
+    this.modules = defaultCollection(builder.modules);
     this.projects = defaultCollection(builder.projects);
     this.rules = defaultCollection(builder.rules);
     this.actionPlans = defaultCollection(builder.actionPlans);
@@ -125,8 +125,8 @@ public Collection<String> componentUuids() {
     return components;
   }
 
-  public Collection<String> componentRootUuids() {
-    return componentRoots;
+  public Collection<String> moduleUuids() {
+    return modules;
   }
 
   public Collection<String> projectUuids() {
@@ -230,7 +230,7 @@ public static class Builder {
     private Collection<String> statuses;
     private Collection<String> resolutions;
     private Collection<String> components;
-    private Collection<String> componentRoots;
+    private Collection<String> modules;
     private Collection<String> projects;
     private Collection<RuleKey> rules;
     private Collection<String> actionPlans;
@@ -278,8 +278,8 @@ public Builder componentUuids(@Nullable Collection<String> l) {
       return this;
     }
 
-    public Builder componentRootUuids(@Nullable Collection<String> l) {
-      this.componentRoots = l;
+    public Builder moduleUuids(@Nullable Collection<String> l) {
+      this.modules = l;
       return this;
     }
 
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/IssueQueryService.java b/server/sonar-server/src/main/java/org/sonar/server/issue/IssueQueryService.java
index 28bb75ae3a02..d5d6473e40aa 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/IssueQueryService.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/IssueQueryService.java
@@ -193,9 +193,9 @@ private void addComponentRootUuids(IssueQuery.Builder builder, DbSession session
       if (componentRoots != null) {
         throw new IllegalArgumentException("componentRoots and componentRootUuids cannot be set simultaneously");
       }
-      builder.componentRootUuids(componentRootUuids);
+      builder.moduleUuids(componentRootUuids);
     } else {
-      builder.componentRootUuids(componentUuids(session, componentRoots));
+      builder.moduleUuids(componentUuids(session, componentRoots));
     }
   }
 
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndex.java b/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndex.java
index 695f617ec238..f83322c952bf 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndex.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndex.java
@@ -24,6 +24,7 @@
 import com.google.common.collect.Collections2;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
 import org.apache.commons.lang.BooleanUtils;
 import org.elasticsearch.action.search.SearchRequestBuilder;
 import org.elasticsearch.action.search.SearchResponse;
@@ -254,9 +255,9 @@ protected Map<String, FilterBuilder> getFilters(IssueQuery query, QueryContext o
     filters.put(IssueIndexDefinition.FIELD_ISSUE_KEY, matchFilter(IssueIndexDefinition.FIELD_ISSUE_KEY, query.issueKeys()));
     filters.put(IssueIndexDefinition.FIELD_ISSUE_ACTION_PLAN, matchFilter(IssueIndexDefinition.FIELD_ISSUE_ACTION_PLAN, query.actionPlans()));
     filters.put(IssueIndexDefinition.FIELD_ISSUE_ASSIGNEE, matchFilter(IssueIndexDefinition.FIELD_ISSUE_ASSIGNEE, query.assignees()));
-    filters.put(IssueIndexDefinition.FIELD_ISSUE_MODULE_PATH, matchFilter(IssueIndexDefinition.FIELD_ISSUE_MODULE_PATH, query.componentRootUuids()));
-    filters.put(IssueIndexDefinition.FIELD_ISSUE_COMPONENT_UUID, matchFilter(IssueIndexDefinition.FIELD_ISSUE_COMPONENT_UUID, query.componentUuids()));
-    filters.put(IssueIndexDefinition.FIELD_ISSUE_PROJECT_UUID, matchFilter(IssueIndexDefinition.FIELD_ISSUE_PROJECT_UUID, query.projectUuids()));
+
+    addComponentRelatedFilters(query, filters);
+
     filters.put(IssueIndexDefinition.FIELD_ISSUE_LANGUAGE, matchFilter(IssueIndexDefinition.FIELD_ISSUE_LANGUAGE, query.languages()));
     filters.put(IssueIndexDefinition.FIELD_ISSUE_TAGS, matchFilter(IssueIndexDefinition.FIELD_ISSUE_TAGS, query.tags()));
     filters.put(IssueIndexDefinition.FIELD_ISSUE_RESOLUTION, matchFilter(IssueIndexDefinition.FIELD_ISSUE_RESOLUTION, query.resolutions()));
@@ -270,6 +271,33 @@ protected Map<String, FilterBuilder> getFilters(IssueQuery query, QueryContext o
     return filters;
   }
 
+  private void addComponentRelatedFilters(IssueQuery query, Map<String, FilterBuilder> filters) {
+    if (query.onComponentOnly()) {
+      Set<String> allComponents = Sets.newHashSet();
+      allComponents.addAll(query.projectUuids());
+      allComponents.addAll(query.moduleUuids());
+      allComponents.addAll(query.componentUuids());
+      filters.put(IssueIndexDefinition.FIELD_ISSUE_COMPONENT_UUID, matchFilter(IssueIndexDefinition.FIELD_ISSUE_COMPONENT_UUID, allComponents));
+    } else {
+      filters.put(IssueIndexDefinition.FIELD_ISSUE_PROJECT_UUID, matchFilter(IssueIndexDefinition.FIELD_ISSUE_PROJECT_UUID, query.projectUuids()));
+      filters.put(IssueIndexDefinition.FIELD_ISSUE_MODULE_UUID, matchFilter(IssueIndexDefinition.FIELD_ISSUE_MODULE_UUID, query.moduleUuids()));
+
+      FilterBuilder componentFilter = matchFilter(IssueIndexDefinition.FIELD_ISSUE_COMPONENT_UUID, query.componentUuids());
+      FilterBuilder modulePathFilter = matchFilter(IssueIndexDefinition.FIELD_ISSUE_MODULE_PATH, query.componentUuids());
+      BoolFilterBuilder compositeFilter = null;
+      if (componentFilter != null || modulePathFilter != null) {
+        compositeFilter = FilterBuilders.boolFilter();
+        if (componentFilter != null) {
+          compositeFilter.should(componentFilter);
+        }
+        if (modulePathFilter != null) {
+          compositeFilter.should(modulePathFilter);
+        }
+      }
+      filters.put(IssueIndexDefinition.FIELD_ISSUE_COMPONENT_UUID, compositeFilter);
+    }
+  }
+
   private FilterBuilder getAuthorizationFilter(QueryContext options) {
     String user = options.getUserLogin();
     Set<String> groups = options.getUserGroups();
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchAction.java b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchAction.java
index 85abb5e40f9d..a621b364d5cf 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchAction.java
@@ -445,6 +445,7 @@ private void collectFacetsData(Request request, Result<Issue> result, Set<String
     collectParameterValues(request, IssueFilterParameters.PROJECT_UUIDS, projectUuids);
     collectFacetKeys(result, IssueFilterParameters.COMPONENT_UUIDS, componentUuids);
     collectParameterValues(request, IssueFilterParameters.COMPONENT_UUIDS, componentUuids);
+    collectParameterValues(request, IssueFilterParameters.MODULE_UUIDS, componentUuids);
     collectParameterValues(request, IssueFilterParameters.COMPONENT_ROOT_UUIDS, componentUuids);
     collectFacetKeys(result, IssueFilterParameters.ASSIGNEES, userLogins);
     collectParameterValues(request, IssueFilterParameters.ASSIGNEES, userLogins);
diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueQueryServiceTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueQueryServiceTest.java
index 2fb0839f50a5..c4f0b7959177 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueQueryServiceTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueQueryServiceTest.java
@@ -117,7 +117,7 @@ public void create_query_from_parameters() {
     assertThat(query.resolutions()).containsOnly("FALSE-POSITIVE");
     assertThat(query.resolved()).isTrue();
     assertThat(query.componentUuids()).containsOnly("ABCD");
-    assertThat(query.componentRootUuids()).containsOnly("BCDE");
+    assertThat(query.moduleUuids()).containsOnly("BCDE");
     assertThat(query.reporters()).containsOnly("marilyn");
     assertThat(query.assignees()).containsOnly("joanna");
     assertThat(query.languages()).containsOnly("xoo");
diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueQueryTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueQueryTest.java
index ff23362a5f72..eb1b56d2d0b3 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueQueryTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueQueryTest.java
@@ -40,7 +40,7 @@ public void build_query() throws Exception {
       .statuses(Lists.newArrayList(Issue.STATUS_RESOLVED))
       .resolutions(newArrayList(Issue.RESOLUTION_FALSE_POSITIVE))
       .componentUuids(newArrayList("org/struts/Action.java"))
-      .componentRootUuids(newArrayList("org.struts:core"))
+      .moduleUuids(newArrayList("org.struts:core"))
       .rules(newArrayList(RuleKey.of("squid", "AvoidCycle")))
       .actionPlans(newArrayList("AP1", "AP2"))
       .reporters(newArrayList("crunky"))
@@ -62,7 +62,7 @@ public void build_query() throws Exception {
     assertThat(query.statuses()).containsOnly(Issue.STATUS_RESOLVED);
     assertThat(query.resolutions()).containsOnly(Issue.RESOLUTION_FALSE_POSITIVE);
     assertThat(query.componentUuids()).containsOnly("org/struts/Action.java");
-    assertThat(query.componentRootUuids()).containsOnly("org.struts:core");
+    assertThat(query.moduleUuids()).containsOnly("org.struts:core");
     assertThat(query.reporters()).containsOnly("crunky");
     assertThat(query.assignees()).containsOnly("gargantua");
     assertThat(query.languages()).containsOnly("xoo");
@@ -111,7 +111,7 @@ public void collection_params_should_not_be_null_but_empty() throws Exception {
     IssueQuery query = IssueQuery.builder()
       .issueKeys(null)
       .componentUuids(null)
-      .componentRootUuids(null)
+      .moduleUuids(null)
       .statuses(null)
       .actionPlans(null)
       .assignees(null)
@@ -124,7 +124,7 @@ public void collection_params_should_not_be_null_but_empty() throws Exception {
       .build();
     assertThat(query.issueKeys()).isEmpty();
     assertThat(query.componentUuids()).isEmpty();
-    assertThat(query.componentRootUuids()).isEmpty();
+    assertThat(query.moduleUuids()).isEmpty();
     assertThat(query.statuses()).isEmpty();
     assertThat(query.actionPlans()).isEmpty();
     assertThat(query.assignees()).isEmpty();
@@ -141,7 +141,7 @@ public void test_default_query() throws Exception {
     IssueQuery query = IssueQuery.builder().build();
     assertThat(query.issueKeys()).isEmpty();
     assertThat(query.componentUuids()).isEmpty();
-    assertThat(query.componentRootUuids()).isEmpty();
+    assertThat(query.moduleUuids()).isEmpty();
     assertThat(query.statuses()).isEmpty();
     assertThat(query.actionPlans()).isEmpty();
     assertThat(query.assignees()).isEmpty();
diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexMediumTest.java
index 7f7b793ce076..df73549e5b59 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexMediumTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexMediumTest.java
@@ -176,41 +176,52 @@ public void filter_by_keys() throws Exception {
   }
 
   @Test
-  public void filter_by_component_roots() throws Exception {
+  public void filter_by_modules() throws Exception {
     ComponentDto module = ComponentTesting.newModuleDto(project);
     ComponentDto subModule = ComponentTesting.newModuleDto(module);
     ComponentDto file = ComponentTesting.newFileDto(subModule);
     tester.get(ComponentDao.class).insert(session, module, subModule, file);
 
     db.issueDao().insert(session,
+      IssueTesting.newDto(rule, module, project),
+      IssueTesting.newDto(rule, subModule, project),
       IssueTesting.newDto(rule, file, project));
     session.commit();
     index();
 
-    assertThat(index.search(IssueQuery.builder().componentRootUuids(newArrayList(file.uuid())).build(), new QueryContext()).getHits()).isEmpty();
-    assertThat(index.search(IssueQuery.builder().componentRootUuids(newArrayList(module.uuid())).build(), new QueryContext()).getHits()).hasSize(1);
-    assertThat(index.search(IssueQuery.builder().componentRootUuids(newArrayList(subModule.uuid())).build(), new QueryContext()).getHits()).hasSize(1);
-    // TODO assertThat(index.search(IssueQuery.builder().componentRootUuids(newArrayList(project.uuid())).build(), new
-    // QueryContext()).getHits()).hasSize(1);
-    assertThat(index.search(IssueQuery.builder().componentRootUuids(newArrayList("unknown")).build(), new QueryContext()).getHits()).isEmpty();
+    assertThat(index.search(IssueQuery.builder().moduleUuids(newArrayList(file.uuid())).build(), new QueryContext()).getHits()).isEmpty();
+    assertThat(index.search(IssueQuery.builder().moduleUuids(newArrayList(module.uuid())).build(), new QueryContext()).getHits()).hasSize(1);
+    assertThat(index.search(IssueQuery.builder().moduleUuids(newArrayList(subModule.uuid())).build(), new QueryContext()).getHits()).hasSize(1);
+    assertThat(index.search(IssueQuery.builder().moduleUuids(newArrayList(project.uuid())).build(), new QueryContext()).getHits()).hasSize(1);
+    assertThat(index.search(IssueQuery.builder().moduleUuids(newArrayList("unknown")).build(), new QueryContext()).getHits()).isEmpty();
   }
 
   @Test
   public void filter_by_components() throws Exception {
+    ComponentDto module = ComponentTesting.newModuleDto(project);
+    ComponentDto subModule = ComponentTesting.newModuleDto(module);
     ComponentDto file1 = ComponentTesting.newFileDto(project);
-    ComponentDto file2 = ComponentTesting.newFileDto(project);
-    tester.get(ComponentDao.class).insert(session, file1, file2);
+    ComponentDto file2 = ComponentTesting.newFileDto(module);
+    ComponentDto file3 = ComponentTesting.newFileDto(subModule);
+    tester.get(ComponentDao.class).insert(session, module, subModule, file1, file2, file3);
 
     db.issueDao().insert(session,
+      IssueTesting.newDto(rule, project, project),
       IssueTesting.newDto(rule, file1, project),
-      IssueTesting.newDto(rule, file2, project));
+      IssueTesting.newDto(rule, module, project),
+      IssueTesting.newDto(rule, file2, project),
+      IssueTesting.newDto(rule, subModule, project),
+      IssueTesting.newDto(rule, file3, project));
     session.commit();
     index();
 
-    assertThat(index.search(IssueQuery.builder().componentUuids(newArrayList(file1.uuid(), file2.uuid())).build(), new QueryContext()).getHits()).hasSize(2);
+    assertThat(index.search(IssueQuery.builder().componentUuids(newArrayList(file1.uuid(), file2.uuid(), file3.uuid())).build(), new QueryContext()).getHits()).hasSize(3);
     assertThat(index.search(IssueQuery.builder().componentUuids(newArrayList(file1.uuid())).build(), new QueryContext()).getHits()).hasSize(1);
+    assertThat(index.search(IssueQuery.builder().componentUuids(newArrayList(subModule.uuid())).build(), new QueryContext()).getHits()).hasSize(2);
+    assertThat(index.search(IssueQuery.builder().componentUuids(newArrayList(subModule.uuid())).onComponentOnly(true).build(), new QueryContext()).getHits()).hasSize(1);
+    assertThat(index.search(IssueQuery.builder().componentUuids(newArrayList(module.uuid())).build(), new QueryContext()).getHits()).hasSize(4);
+    assertThat(index.search(IssueQuery.builder().componentUuids(newArrayList(module.uuid())).onComponentOnly(true).build(), new QueryContext()).getHits()).hasSize(1);
     assertThat(index.search(IssueQuery.builder().componentUuids(newArrayList("unknown")).build(), new QueryContext()).getHits()).isEmpty();
-    assertThat(index.search(IssueQuery.builder().componentUuids(newArrayList(project.uuid())).build(), new QueryContext()).getHits()).isEmpty();
   }
 
   @Test
@@ -663,7 +674,7 @@ public void authorized_issues_on_groups() throws Exception {
     assertThat(index.search(query.build(), new QueryContext()).getHits()).hasSize(0);
 
     MockUserSession.set().setUserGroups("sonar-users", "sonar-admins");
-    assertThat(index.search(query.componentRootUuids(newArrayList(project3.key())).build(), new QueryContext()).getHits()).hasSize(0);
+    assertThat(index.search(query.moduleUuids(newArrayList(project3.key())).build(), new QueryContext()).getHits()).hasSize(0);
   }
 
   @Test
@@ -711,7 +722,7 @@ public void authorized_issues_on_user() throws Exception {
     assertThat(index.search(query.build(), new QueryContext()).getHits()).hasSize(0);
 
     MockUserSession.set().setLogin("john");
-    assertThat(index.search(query.componentRootUuids(newArrayList(project3.key())).build(), new QueryContext()).getHits()).hasSize(0);
+    assertThat(index.search(query.moduleUuids(newArrayList(project3.key())).build(), new QueryContext()).getHits()).hasSize(0);
   }
 
   @Test