diff --git a/json-logic-java/src/main/java/com/jsonlogic/FilterNode.java b/json-logic-java/src/main/java/com/jsonlogic/FilterNode.java
index 735a37e..8c0268a 100644
--- a/json-logic-java/src/main/java/com/jsonlogic/FilterNode.java
+++ b/json-logic-java/src/main/java/com/jsonlogic/FilterNode.java
@@ -40,29 +40,27 @@ Result eval(Map<String, Result> data) throws EvaluationException{
 
         right.treeToString(sb);
 
-        if(sb.toString().contains("{\"var\":\"\"}"))
-        {
-            JsonArray results=new JsonArray();
+        
+        JsonArray results=new JsonArray();
 
-            for(int i=0;i<leftResult.getArrayValue().size();i++)
-            {
-                String afterReplace=sb.toString().replace("{\"var\":\"\"}",leftResult.getArrayValue().get(i).getAsDouble()+"");
+        for(int i=0;i<leftResult.getArrayValue().size();i++)
+        {
+            //String afterReplace=sb.toString().replace("{\"var\":\"\"}",leftResult.getArrayValue().get(i).getAsDouble()+"");
 
-                try {
-                    Result r=new JsonLogic().apply(afterReplace,"");
+            try {
+                Result r=new JsonLogic().apply(sb.toString(),leftResult.getArrayValue().get(i).toString());
 
-                    if(r.getBooleanValue())
-                        results.add(leftResult.getArrayValue().get(i).getAsDouble());
+                if(r.getBooleanValue())
+                    results.add(leftResult.getArrayValue().get(i));
 
-                }catch (Exception ex){
-                    ex.printStackTrace();
-                }
+            }catch (Exception ex){
+                ex.printStackTrace();
             }
-
-            return new Result(results);
         }
 
-        return null;
+        return new Result(results);
+        
+
     }
 
     @Override
diff --git a/json-logic-java/src/main/java/com/jsonlogic/JsonLogicTree.java b/json-logic-java/src/main/java/com/jsonlogic/JsonLogicTree.java
index e6c5440..c1b04e6 100644
--- a/json-logic-java/src/main/java/com/jsonlogic/JsonLogicTree.java
+++ b/json-logic-java/src/main/java/com/jsonlogic/JsonLogicTree.java
@@ -23,6 +23,7 @@
 import java.io.IOException;
 import java.io.StringReader;
 import java.util.*;
+import java.util.regex.Matcher;
 
 /**
  * JsonLogicTree is a reusable representation of a 'JsonLogic' expression.
@@ -131,7 +132,9 @@ private void readValue(String name, JsonReader jsonReader, Map<String, Result> t
                         {
                             if(entry.getKey().startsWith(name+".$"+i))
                             {
-                                String fieldName=entry.getKey().replaceAll("^"+name+"\\.\\$"+i+"\\.","");
+                                String regName = name.replaceAll("\\$", Matcher.quoteReplacement("\\$"));
+
+                                String fieldName=entry.getKey().replaceAll("^"+regName+"\\.\\$"+i+"\\.","");
 
                                 if(entry.getValue().isString())
                                     jj.addProperty(fieldName,entry.getValue().getStringValue());
@@ -139,6 +142,10 @@ else if(entry.getValue().isDouble())
                                     jj.addProperty(fieldName,entry.getValue().getDoubleValue());
                                 else if(entry.getValue().isBoolean())
                                     jj.addProperty(fieldName,entry.getValue().getBooleanValue());
+                                else if(entry.getValue().isNull())
+                                    jj.add(fieldName,null);
+                                else if(entry.getValue().isArray())
+                                    jj.add(fieldName,entry.getValue().getArrayValue());
                             }
                         }
 
@@ -160,6 +167,9 @@ else if(entry.getValue().isDouble())
                             doomed.add(entry.getValue().getDoubleValue());
                         else if(entry.getValue().isBoolean())
                             doomed.add(entry.getValue().getBooleanValue());
+                     
+                        else if(entry.getValue().isArray())
+                            doomed.add(entry.getValue().getArrayValue());
                     }
 
                     jsonReader.endArray();
diff --git a/json-logic-java/src/main/java/com/jsonlogic/ReduceNode.java b/json-logic-java/src/main/java/com/jsonlogic/ReduceNode.java
index 1c747e4..c1b32a6 100644
--- a/json-logic-java/src/main/java/com/jsonlogic/ReduceNode.java
+++ b/json-logic-java/src/main/java/com/jsonlogic/ReduceNode.java
@@ -41,8 +41,8 @@ Result eval(Map<String, Result> data) throws EvaluationException{
 
         nodes.get(1).treeToString(sb);
 
-        if(!sb.toString().contains("{\"var\":\"current\"}")||!sb.toString().contains("{\"var\":\"accumulator\"}"))
-            throw new EvaluationException("reduce operation missing current or accumulator");
+        if(!sb.toString().contains("{\"var\":\"accumulator\"}"))
+            throw new EvaluationException("reduce operation missing accumulator");
 
         Double accumulator=0.0;
 
@@ -54,10 +54,17 @@ Result eval(Map<String, Result> data) throws EvaluationException{
 
         for(int i=0;i<leftResult.getArrayValue().size();i++)
         {
-            String afterReplace=sb.toString()
+            String afterReplace;
+            if(sb.toString().contains("{\"var\":\"current\"}")){
+                afterReplace=sb.toString()
                     .replace("{\"var\":\"current\"}",leftResult.getArrayValue().get(i).getAsDouble()+"")
                     .replace("{\"var\":\"accumulator\"}",accumulator+"")
                     ;
+            }else{
+                afterReplace=sb.toString()
+                    .replace("{\"var\":\"accumulator\"}",accumulator+"")
+                    ;
+            }
 
             try {
                 Result r=new JsonLogic().apply(afterReplace,"");