diff --git a/Chrosey.Extensions.csproj b/Chrosey.Extensions.csproj
index 36b61ba..d952b49 100644
--- a/Chrosey.Extensions.csproj
+++ b/Chrosey.Extensions.csproj
@@ -52,8 +52,10 @@
     <Compile Include="Exceptions\NotFoundException.cs" />
     <Compile Include="NumberExtensions.cs" />
     <Compile Include="ColorExtensions.cs" />
+    <Compile Include="PredicateBuilder.cs" />
     <Compile Include="StringExtensions.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Wrapper\ConcurrentQueueWrapper.cs" />
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/CollectionExtensions.cs b/CollectionExtensions.cs
index 5eba64b..12a953a 100644
--- a/CollectionExtensions.cs
+++ b/CollectionExtensions.cs
@@ -9,12 +9,12 @@ namespace Chrosey.Extensions
 {
     public static class CollectionExtensions
     {
-        public static string GetValue(this Dictionary<string,string> dict,string key)
+        public static T Get<T>(this Dictionary<string, T> dict, string key) where T : class
         {
-            string value;
+            T value;
             if (!dict.TryGetValue(key,out value))
             {
-                return string.Empty;
+                return null;
             }
             return value;
         }
@@ -29,39 +29,49 @@ namespace Chrosey.Extensions
             {
                 try
                 {
-                    var value = query[condition].ToString();
-                    if (value.EndsWith("*") && value.StartsWith("*"))
+                    var values = query[condition].Split('|');
+                    var predicate = PredicateBuilder.False<T>();
+                    foreach (var value in values)
                     {
-                        collection = collection
-                            .Where(m => m
-                                .GetPropertyValue(condition)
-                                .ToString()
-                                .IndexOf(value.Trim('*'), StringComparison.CurrentCultureIgnoreCase) > -1);
-                    }
-                    else if (value.EndsWith("*"))
-                    {
-                        collection = collection
-                             .Where(m => m
-                                 .GetPropertyValue(condition)
-                                 .ToString()
-                                 .StartsWith(value.Trim('*'), StringComparison.CurrentCultureIgnoreCase));
-                    }
-                    else if (value.StartsWith("*"))
-                    {
-                        collection = collection
-                             .Where(m => m
-                                 .GetPropertyValue(condition)
-                                 .ToString()
-                                 .EndsWith(value.Trim('*'), StringComparison.CurrentCultureIgnoreCase));
-                    }
-                    else
-                    {
-                        collection = collection
-                             .Where(m => m
-                                 .GetPropertyValue(condition)
-                                 .ToString()
-                                 .Equals(value, StringComparison.CurrentCultureIgnoreCase));
+                        if (value.EndsWith("*") && value.StartsWith("*"))
+                        {
+                            predicate = predicate
+                                .Or(m => m
+                                    .GetPropertyValue(condition)
+                                    .ToString()
+                                    .IndexOf(value.Trim('*'), StringComparison.CurrentCultureIgnoreCase) > -1
+                                    );
+                        }
+                        else if (value.EndsWith("*"))
+                        {
+                            predicate = predicate
+                                .Or(m => m
+                                     .GetPropertyValue(condition)
+                                     .ToString()
+                                     .StartsWith(value.Trim('*'), StringComparison.CurrentCultureIgnoreCase)
+                                     );
+                        }
+                        else if (value.StartsWith("*"))
+                        {
+                            predicate = predicate
+                                .Or(m => m
+                                     .GetPropertyValue(condition)
+                                     .ToString()
+                                     .EndsWith(value.Trim('*'), StringComparison.CurrentCultureIgnoreCase)
+                                     );
+                        }
+                        else
+                        {
+                            predicate = predicate
+                                .Or(m => m
+                                     .GetPropertyValue(condition)
+                                     .ToString()
+                                     .Equals(value, StringComparison.CurrentCultureIgnoreCase)
+                                     );
+                        }
                     }
+
+                    collection = collection.AsQueryable().Where(predicate);
                 }
                 catch (NotFoundException)
                 {
@@ -71,11 +81,15 @@ namespace Chrosey.Extensions
             }
             return collection;
         }
-        public static IOrderedEnumerable<T> Sort<T>(this IEnumerable<T> collection, NameValueCollection query) where T : class
+        public static IOrderedEnumerable<T> Sort<T>(this IEnumerable<T> collection, NameValueCollection query, string defaultSortProperty = "") where T : class
         {
             
             if (string.IsNullOrEmpty(query["sort"]))
             {
+                if (!string.IsNullOrEmpty(defaultSortProperty) && collection.First().HasProperty(defaultSortProperty))
+                {
+                    return collection.OrderBy(c => c.GetPropertyValue(defaultSortProperty));
+                }
                 return collection.OrderBy(i => i);
             }
 
@@ -113,19 +127,17 @@ namespace Chrosey.Extensions
 
             if (string.IsNullOrEmpty(groupBy) || !props.Contains(groupBy))
             {
-                return collection.GroupBy(i => "Alle " + typeof(T).ToString());
+                return collection.GroupBy(i => "Alle " + typeof(T).Name);
             }
 
-            var grouped = entferneAb > 0
-                ? collection.GroupBy(i => i.GetPropertyValue(groupBy).ToString().Remove(entferneAb))
+            return entferneAb > 0
+                ? collection.GroupBy(i => i.GetPropertyValue(groupBy).ToString().Remove(Math.Min(entferneAb, i.GetPropertyValue(groupBy).ToString().Length)))
                 : collection.GroupBy(i => i.GetPropertyValue(groupBy));
-
-            return grouped; 
         }
 
-        public static IEnumerable<IGrouping<object, T>> Organize<T>(this IEnumerable<T> collection, NameValueCollection query) where T : class
+        public static IEnumerable<IGrouping<object, T>> Organize<T>(this IEnumerable<T> collection, NameValueCollection query, string defaultSortProperty = "") where T : class
         {
-            return collection.Filter(query).Sort(query).GroupBy(query);
+            return collection.Filter(query).Sort(query, defaultSortProperty).GroupBy(query);
         }
     }
 }
diff --git a/PredicateBuilder.cs b/PredicateBuilder.cs
new file mode 100644
index 0000000..1aef94c
--- /dev/null
+++ b/PredicateBuilder.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Chrosey.Extensions
+{
+    public static class PredicateBuilder
+    {
+        public static Expression<Func<T, bool>> True<T>() { return f => true; }
+        public static Expression<Func<T, bool>> False<T>() { return f => false; }
+
+        public static Expression<Func<T, bool>> Or<T>(this Expression<Func<T, bool>> expr1,
+                                                            Expression<Func<T, bool>> expr2)
+        {
+            var invokedExpr = Expression.Invoke(expr2, expr1.Parameters.Cast<Expression>());
+            return Expression.Lambda<Func<T, bool>>
+                  (Expression.OrElse(expr1.Body, invokedExpr), expr1.Parameters);
+        }
+
+        public static Expression<Func<T, bool>> And<T>(this Expression<Func<T, bool>> expr1,
+                                                             Expression<Func<T, bool>> expr2)
+        {
+            var invokedExpr = Expression.Invoke(expr2, expr1.Parameters.Cast<Expression>());
+            return Expression.Lambda<Func<T, bool>>
+                  (Expression.AndAlso(expr1.Body, invokedExpr), expr1.Parameters);
+        }
+    }
+}
diff --git a/Wrapper/ConcurrentQueueWrapper.cs b/Wrapper/ConcurrentQueueWrapper.cs
new file mode 100644
index 0000000..3875abe
--- /dev/null
+++ b/Wrapper/ConcurrentQueueWrapper.cs
@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Chrosey.Extensions.Wrapper
+{
+    public class ConcurrentQueueWrapper<T>
+    {
+        private readonly ConcurrentQueue<T> queue = new ConcurrentQueue<T>();
+        public event EventHandler Changed;
+        protected virtual void OnChanged()
+        {
+            if (Changed != null) Changed(this, EventArgs.Empty);
+        }
+
+        public virtual void Enqueue(T item)
+        {
+            queue.Enqueue(item);
+            OnChanged();
+        }
+        public int Count { get { return queue.Count; } }
+
+        public virtual bool TryDequeue(out T item)
+        {
+            if (queue.TryDequeue(out item))
+            {
+                OnChanged();
+                return true;
+            }
+            return false;
+        }
+    }
+}