diff --git a/processing/src/main/java/io/druid/segment/incremental/IncrementalIndexStorageAdapter.java b/processing/src/main/java/io/druid/segment/incremental/IncrementalIndexStorageAdapter.java
index 057754e6087..1c452496ffb 100644
--- a/processing/src/main/java/io/druid/segment/incremental/IncrementalIndexStorageAdapter.java
+++ b/processing/src/main/java/io/druid/segment/incremental/IncrementalIndexStorageAdapter.java
@@ -566,10 +566,6 @@ public class IncrementalIndexStorageAdapter implements StorageAdapter
     @Override
     public ValueMatcher makeValueMatcher(final String dimension, final Bound bound)
     {
-      if (!dimension.endsWith(".geo")) {
-        return new BooleanValueMatcher(false);
-      }
-
       Integer dimIndexObject = index.getDimensionIndex(dimension.toLowerCase());
       if (dimIndexObject == null) {
         return new BooleanValueMatcher(false);
@@ -601,4 +597,4 @@ public class IncrementalIndexStorageAdapter implements StorageAdapter
       };
     }
   }
-}
+}
\ No newline at end of file
diff --git a/server/src/main/java/io/druid/segment/realtime/plumber/RealtimePlumber.java b/server/src/main/java/io/druid/segment/realtime/plumber/RealtimePlumber.java
index 4f3b3c17587..fb28f6c8ae1 100644
--- a/server/src/main/java/io/druid/segment/realtime/plumber/RealtimePlumber.java
+++ b/server/src/main/java/io/druid/segment/realtime/plumber/RealtimePlumber.java
@@ -786,7 +786,7 @@ public class RealtimePlumber implements Plumber
           public boolean apply(final DataSegment segment)
           {
             return
-                schema.getDataSource().equals(segment.getDataSource())
+                schema.getDataSource().equalsIgnoreCase(segment.getDataSource())
                 && config.getShardSpec().getPartitionNum() == segment.getShardSpec().getPartitionNum()
                 && Iterables.any(
                     sinks.keySet(), new Predicate<Long>()