diff --git a/umbraco.MacroEngines.Juno/DynamicDictionary.cs b/umbraco.MacroEngines.Juno/DynamicDictionary.cs
index ad16edf8b5..dfe85bb561 100644
--- a/umbraco.MacroEngines.Juno/DynamicDictionary.cs
+++ b/umbraco.MacroEngines.Juno/DynamicDictionary.cs
@@ -15,7 +15,14 @@ namespace umbraco.MacroEngines
         }
         public override bool TrySetMember(SetMemberBinder binder, object value)
         {
-            _dictionary[binder.Name] = value;
+            if (_dictionary.ContainsKey(binder.Name))
+            {
+                _dictionary[binder.Name.ToLower()] = value;
+            }
+            else
+            {
+                _dictionary.Add(binder.Name.ToLower(), value);
+            }
             return true;
         }
         public override bool TryGetMember(GetMemberBinder binder, out object result)
diff --git a/umbraco.MacroEngines.Juno/DynamicNode.cs b/umbraco.MacroEngines.Juno/DynamicNode.cs
index bef5ea2bce..27441e17f2 100644
--- a/umbraco.MacroEngines.Juno/DynamicNode.cs
+++ b/umbraco.MacroEngines.Juno/DynamicNode.cs
@@ -370,7 +370,11 @@ namespace umbraco.MacroEngines
         {
             get { if (n == null) return null; return n.Name; }
         }
-
+        public bool Visible
+        {
+            get;
+            set;
+        }
         public string Url
         {
             get { if (n == null) return null; return n.Url; }
diff --git a/umbraco.MacroEngines.Juno/DynamicNodeList.cs b/umbraco.MacroEngines.Juno/DynamicNodeList.cs
index 8dc7630b0a..bd3ae00c20 100644
--- a/umbraco.MacroEngines.Juno/DynamicNodeList.cs
+++ b/umbraco.MacroEngines.Juno/DynamicNodeList.cs
@@ -8,7 +8,8 @@ using System.Collections;
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Web.Compilation;
-
+using System.Linq.Expressions;
+using System.Linq.Dynamic;
 namespace umbraco.MacroEngines
 {
     public class DynamicNodeList : DynamicObject, IEnumerable
@@ -31,6 +32,13 @@ namespace umbraco.MacroEngines
         public override bool TryInvokeMember(InvokeMemberBinder binder, object[] args, out object result)
         {
             var name = binder.Name;
+            if (name == "Where")
+            {
+                string predicate = args.First().ToString();
+                var values = args.Skip(1).ToArray();
+                result = new DynamicNodeList(this.Where<DynamicNode>(predicate, values).ToList());
+                return true;
+            }
 
             try
             {
@@ -209,5 +217,10 @@ namespace umbraco.MacroEngines
         {
             return Items.GetEnumerator();
         }
+
+        public IQueryable<T> Where<T>(string predicate, params object[] values)
+        {
+            return ((IQueryable<T>)Items.AsQueryable()).Where(predicate, values);
+        }
     }
 }
diff --git a/umbraco.MacroEngines.Juno/umbraco.MacroEngines.csproj b/umbraco.MacroEngines.Juno/umbraco.MacroEngines.csproj
index 67de9971b7..102c62fea3 100644
--- a/umbraco.MacroEngines.Juno/umbraco.MacroEngines.csproj
+++ b/umbraco.MacroEngines.Juno/umbraco.MacroEngines.csproj
@@ -63,9 +63,11 @@
   <ItemGroup>
     <Compile Include="DLRScriptingEngine.cs" />
     <Compile Include="DynamicDictionary.cs" />
+    <Compile Include="DynamicQueryableBinders.cs" />
     <Compile Include="DynamicMedia.cs" />
     <Compile Include="DynamicNode.cs" />
     <Compile Include="DynamicNodeList.cs" />
+    <Compile Include="DynamicQueryable.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="RazorEngine.cs" />
     <Compile Include="Scripting\MacroScript.cs" />