diff --git a/src/Umbraco.Web/Models/TemplateQuery/QueryConditionExtensions.cs b/src/Umbraco.Web/Models/TemplateQuery/QueryConditionExtensions.cs
new file mode 100644
index 0000000000..f01d247b1f
--- /dev/null
+++ b/src/Umbraco.Web/Models/TemplateQuery/QueryConditionExtensions.cs
@@ -0,0 +1,74 @@
+using System;
+using System.Linq.Expressions;
+using System.Reflection;
+
+namespace Umbraco.Web.Models.TemplateQuery
+{
+    internal static class QueryConditionExtensions
+    {
+        private static Lazy<MethodInfo> StringContainsMethodInfo =>
+            new Lazy<MethodInfo>(() => typeof(string).GetMethod("Contains", new[] {typeof(string)}));
+
+        public static Expression<Func<T, bool>> BuildCondition<T>(this QueryCondition condition, string parameterAlias)
+        {
+            object constraintValue;
+            switch (condition.Property.Type.ToLowerInvariant())
+            {
+                case "string":
+                    constraintValue = condition.ConstraintValue;
+                    break;
+                case "datetime":
+                    constraintValue = DateTime.Parse(condition.ConstraintValue);
+                    break;
+                case "boolean":
+                    constraintValue = Boolean.Parse(condition.ConstraintValue);
+                    break;
+                default:
+                    constraintValue = Convert.ChangeType(condition.ConstraintValue, typeof(int));
+                    break;
+            }
+
+            var parameterExpression = Expression.Parameter(typeof(T), parameterAlias);
+            var propertyExpression = Expression.Property(parameterExpression, condition.Property.Alias);
+
+            var valueExpression = Expression.Constant(constraintValue);
+            Expression bodyExpression;
+            switch (condition.Term.Operator)
+            {
+                case Operator.NotEquals:
+                    bodyExpression = Expression.NotEqual(propertyExpression, valueExpression);
+                    break;
+                case Operator.GreaterThan:
+                    bodyExpression = Expression.GreaterThan(propertyExpression, valueExpression);
+                    break;
+                case Operator.GreaterThanEqualTo:
+                    bodyExpression = Expression.GreaterThanOrEqual(propertyExpression, valueExpression);
+                    break;
+                case Operator.LessThan:
+                    bodyExpression = Expression.LessThan(propertyExpression, valueExpression);
+                    break;
+                case Operator.LessThanEqualTo:
+                    bodyExpression = Expression.LessThanOrEqual(propertyExpression, valueExpression);
+                    break;
+                case Operator.Contains:
+                    bodyExpression = Expression.Call(propertyExpression, StringContainsMethodInfo.Value,
+                        valueExpression);
+                    break;
+                case Operator.NotContains:
+                    var tempExpression = Expression.Call(propertyExpression, StringContainsMethodInfo.Value,
+                        valueExpression);
+                    bodyExpression = Expression.Equal(tempExpression, Expression.Constant(false));
+                    break;
+                default:
+                case Operator.Equals:
+                    bodyExpression = Expression.Equal(propertyExpression, valueExpression);
+                    break;
+            }
+
+            var predicate =
+                Expression.Lambda<Func<T, bool>>(bodyExpression.Reduce(), parameterExpression);
+
+            return predicate;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index c399f3f3ae..9bce93b0ff 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -182,6 +182,7 @@
     <Compile Include="Models\ContentEditing\LinkDisplay.cs" />
     <Compile Include="Models\ContentEditing\MacroDisplay.cs" />
     <Compile Include="Models\ContentEditing\MacroParameterDisplay.cs" />
+    <Compile Include="Models\TemplateQuery\QueryConditionExtensions.cs" />
     <Compile Include="Services\DashboardService.cs" />
     <Compile Include="Services\IDashboardService.cs" />
     <Compile Include="Models\Link.cs" />