diff --git a/.gitignore b/.gitignore
index 4158ead..c23d12a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -165,3 +165,4 @@ pip-log.txt
 # Mac crap
 .DS_Store
 NuGetPackage/
+.vs/
diff --git a/LinqToQueryString.IntegrationTests/App.config b/LinqToQueryString.IntegrationTests/App.config
index f59175b..6b87aad 100644
--- a/LinqToQueryString.IntegrationTests/App.config
+++ b/LinqToQueryString.IntegrationTests/App.config
@@ -1,31 +1,31 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <configSections>
-    <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+    <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
     <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
   </configSections>
   <connectionStrings>
-    <add name="TestDbContext" connectionString="Data Source=TestDatabase.sdf" providerName="System.Data.SqlServerCe.4.0" />
+    <add name="TestDbContext" connectionString="Data Source=TestDatabase.sdf" providerName="System.Data.SqlServerCe.4.0"/>
   </connectionStrings>
   <system.data>
     <DbProviderFactories>
-      <remove invariant="System.Data.SqlServerCe.4.0" />
-      <add name="Microsoft SQL Server Compact Data Provider 4.0" invariant="System.Data.SqlServerCe.4.0" description=".NET Framework Data Provider for Microsoft SQL Server Compact" type="System.Data.SqlServerCe.SqlCeProviderFactory, System.Data.SqlServerCe, Version=4.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91" />
+      <remove invariant="System.Data.SqlServerCe.4.0"/>
+      <add name="Microsoft SQL Server Compact Data Provider 4.0" invariant="System.Data.SqlServerCe.4.0" description=".NET Framework Data Provider for Microsoft SQL Server Compact" type="System.Data.SqlServerCe.SqlCeProviderFactory, System.Data.SqlServerCe, Version=4.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91"/>
     </DbProviderFactories>
   </system.data>
   <entityFramework>
     <defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlCeConnectionFactory, EntityFramework">
       <parameters>
-        <parameter value="System.Data.SqlServerCe.4.0" />
+        <parameter value="System.Data.SqlServerCe.4.0"/>
       </parameters>
     </defaultConnectionFactory>
   </entityFramework>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" /></startup>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="Moq" publicKeyToken="69f491c39445e920" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.1309.1617" newVersion="4.1.1309.1617" />
+        <assemblyIdentity name="Moq" publicKeyToken="69f491c39445e920" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-4.1.1309.1617" newVersion="4.1.1309.1617"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
diff --git a/LinqToQueryString.IntegrationTests/LinqToQueryString.IntegrationTests.Sql.csproj b/LinqToQueryString.IntegrationTests/LinqToQueryString.IntegrationTests.Sql.csproj
index 461ea91..cf67523 100644
--- a/LinqToQueryString.IntegrationTests/LinqToQueryString.IntegrationTests.Sql.csproj
+++ b/LinqToQueryString.IntegrationTests/LinqToQueryString.IntegrationTests.Sql.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -8,7 +8,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>LinqToQueryString.IntegrationTests.Sql</RootNamespace>
     <AssemblyName>LinqToQueryString.IntegrationTests.Sql</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
@@ -28,6 +28,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -36,6 +37,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="EntityFramework, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
diff --git a/LinqToQueryString.IntegrationTests/packages.config b/LinqToQueryString.IntegrationTests/packages.config
index 7514d21..5d01d01 100644
--- a/LinqToQueryString.IntegrationTests/packages.config
+++ b/LinqToQueryString.IntegrationTests/packages.config
@@ -4,8 +4,8 @@
   <package id="EntityFramework.SqlServerCompact" version="4.3.6" targetFramework="net45" />
   <package id="Machine.Fakes" version="2.0.0" targetFramework="net40" />
   <package id="Machine.Fakes.Moq" version="2.0.0" targetFramework="net40" />
-  <package id="Machine.Specifications" version="0.7.0-Unstable0077" targetFramework="net40" />
-  <package id="Machine.Specifications.Should" version="0.7.0-Unstable0008" targetFramework="net40" />
+  <package id="Machine.Specifications" version="0.7.0-Unstable0077" targetFramework="net40" requireReinstallation="true" />
+  <package id="Machine.Specifications.Should" version="0.7.0-Unstable0008" targetFramework="net40" requireReinstallation="true" />
   <package id="Microsoft.SqlServer.Compact" version="4.0.8876.1" targetFramework="net45" />
   <package id="Moq" version="4.2.1312.1622" targetFramework="net40" />
   <package id="SqlServerCompact" version="4.0.8854.1" targetFramework="net45" />
diff --git a/LinqToQueryString.Tests/LinqToQueryString.Tests.csproj b/LinqToQueryString.Tests/LinqToQueryString.Tests.csproj
index 761a599..dbbe35b 100644
--- a/LinqToQueryString.Tests/LinqToQueryString.Tests.csproj
+++ b/LinqToQueryString.Tests/LinqToQueryString.Tests.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -8,7 +8,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>LinqToQueryString.Tests</RootNamespace>
     <AssemblyName>LinqToQueryString.Tests</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
@@ -26,6 +26,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -34,6 +35,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Machine.Specifications, Version=0.7.0.0, Culture=neutral, processorArchitecture=MSIL">
diff --git a/LinqToQueryString.UnitTests/LinqToQueryString.UnitTests.csproj b/LinqToQueryString.UnitTests/LinqToQueryString.UnitTests.csproj
index b8044a2..51fafc2 100644
--- a/LinqToQueryString.UnitTests/LinqToQueryString.UnitTests.csproj
+++ b/LinqToQueryString.UnitTests/LinqToQueryString.UnitTests.csproj
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\NUnit.3.11.0\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.11.0\build\NUnit.props')" />
+  <Import Project="..\packages\Microsoft.NET.Test.Sdk.16.0.1\build\net40\Microsoft.NET.Test.Sdk.props" Condition="Exists('..\packages\Microsoft.NET.Test.Sdk.16.0.1\build\net40\Microsoft.NET.Test.Sdk.props')" />
+  <Import Project="..\packages\Microsoft.CodeCoverage.16.0.1\build\netstandard1.0\Microsoft.CodeCoverage.props" Condition="Exists('..\packages\Microsoft.CodeCoverage.16.0.1\build\netstandard1.0\Microsoft.CodeCoverage.props')" />
+  <Import Project="..\packages\Machine.Specifications.Runner.VisualStudio.2.8.0\build\net46\Machine.Specifications.Runner.VisualStudio.props" Condition="Exists('..\packages\Machine.Specifications.Runner.VisualStudio.2.8.0\build\net46\Machine.Specifications.Runner.VisualStudio.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -8,7 +12,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>LinqToQueryString.UnitTests</RootNamespace>
     <AssemblyName>LinqToQueryString.UnitTests</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
@@ -19,6 +23,8 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
     <TargetFrameworkProfile />
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -28,6 +34,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -36,6 +43,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Machine.Specifications, Version=0.7.0.0, Culture=neutral, processorArchitecture=MSIL">
@@ -45,9 +53,27 @@
     <Reference Include="Machine.Specifications.Should">
       <HintPath>..\packages\Machine.Specifications.Should.0.7.0-Unstable0008\lib\net20\Machine.Specifications.Should.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.VisualStudio.CodeCoverage.Shim, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.CodeCoverage.16.0.1\lib\net45\Microsoft.VisualStudio.CodeCoverage.Shim.dll</HintPath>
+    </Reference>
+    <Reference Include="Mono.Cecil, Version=0.10.0.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
+      <HintPath>..\packages\Mono.Cecil.0.10.0\lib\net40\Mono.Cecil.dll</HintPath>
+    </Reference>
+    <Reference Include="Mono.Cecil.Mdb, Version=0.10.0.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
+      <HintPath>..\packages\Mono.Cecil.0.10.0\lib\net40\Mono.Cecil.Mdb.dll</HintPath>
+    </Reference>
+    <Reference Include="Mono.Cecil.Pdb, Version=0.10.0.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
+      <HintPath>..\packages\Mono.Cecil.0.10.0\lib\net40\Mono.Cecil.Pdb.dll</HintPath>
+    </Reference>
+    <Reference Include="Mono.Cecil.Rocks, Version=0.10.0.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
+      <HintPath>..\packages\Mono.Cecil.0.10.0\lib\net40\Mono.Cecil.Rocks.dll</HintPath>
+    </Reference>
     <Reference Include="Moq">
       <HintPath>..\packages\Moq.4.1.1309.1617\lib\net35\Moq.dll</HintPath>
     </Reference>
+    <Reference Include="nunit.framework, Version=3.11.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.11.0\lib\net45\nunit.framework.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
   </ItemGroup>
   <Choose>
@@ -69,6 +95,8 @@
     <Compile Include="Filtering.cs" />
     <Compile Include="Functions.cs" />
     <Compile Include="InlineCount.cs" />
+    <Compile Include="Nunit\Aggregation.cs" />
+    <Compile Include="Nunit\Projection.cs" />
     <Compile Include="Options.cs" />
     <Compile Include="PagingAndOrdering.cs" />
     <Compile Include="Projection.cs" />
@@ -87,6 +115,7 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup />
   <Choose>
     <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
       <ItemGroup>
@@ -107,6 +136,19 @@
   </Choose>
   <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\Machine.Specifications.Runner.VisualStudio.2.8.0\build\net46\Machine.Specifications.Runner.VisualStudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Machine.Specifications.Runner.VisualStudio.2.8.0\build\net46\Machine.Specifications.Runner.VisualStudio.props'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.CodeCoverage.16.0.1\build\netstandard1.0\Microsoft.CodeCoverage.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeCoverage.16.0.1\build\netstandard1.0\Microsoft.CodeCoverage.props'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.CodeCoverage.16.0.1\build\netstandard1.0\Microsoft.CodeCoverage.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeCoverage.16.0.1\build\netstandard1.0\Microsoft.CodeCoverage.targets'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.NET.Test.Sdk.16.0.1\build\net40\Microsoft.NET.Test.Sdk.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.NET.Test.Sdk.16.0.1\build\net40\Microsoft.NET.Test.Sdk.props'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.NET.Test.Sdk.16.0.1\build\net40\Microsoft.NET.Test.Sdk.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.NET.Test.Sdk.16.0.1\build\net40\Microsoft.NET.Test.Sdk.targets'))" />
+    <Error Condition="!Exists('..\packages\NUnit.3.11.0\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.11.0\build\NUnit.props'))" />
+  </Target>
+  <Import Project="..\packages\Microsoft.CodeCoverage.16.0.1\build\netstandard1.0\Microsoft.CodeCoverage.targets" Condition="Exists('..\packages\Microsoft.CodeCoverage.16.0.1\build\netstandard1.0\Microsoft.CodeCoverage.targets')" />
+  <Import Project="..\packages\Microsoft.NET.Test.Sdk.16.0.1\build\net40\Microsoft.NET.Test.Sdk.targets" Condition="Exists('..\packages\Microsoft.NET.Test.Sdk.16.0.1\build\net40\Microsoft.NET.Test.Sdk.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/LinqToQueryString.UnitTests/Nunit/Aggregation.cs b/LinqToQueryString.UnitTests/Nunit/Aggregation.cs
new file mode 100644
index 0000000..b481e03
--- /dev/null
+++ b/LinqToQueryString.UnitTests/Nunit/Aggregation.cs
@@ -0,0 +1,250 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using LinqToQuerystring;
+using LinqToQueryString.Tests;
+using NUnit.Framework;
+
+namespace LinqToQueryString.UnitTests.Nunit
+{
+    public abstract class Aggregations
+    {
+        protected static Exception ex;
+
+        protected static IQueryable<Dictionary<string, object>> result;
+
+        protected static IQueryable<Dictionary<string, object>> complexResult;
+
+        protected static IQueryable<Dictionary<string, object>> nullableResult;
+
+        protected static List<ConcreteClass> concreteCollection;
+
+        protected static List<ComplexClass> complexCollection;
+
+        protected static List<NullableClass> nullableCollection;
+
+        protected static Guid[] guidArray;
+
+        protected void CreateContext()
+        {
+            guidArray = Enumerable.Range(1, 5).Select(o => Guid.NewGuid()).ToArray();
+
+            concreteCollection = new List<ConcreteClass>
+                                         {
+                                             InstanceBuilders.BuildConcrete("Apple", 1, new DateTime(2001, 01, 01), true),
+                                             InstanceBuilders.BuildConcrete("Banana", 2, new DateTime(2002, 01, 01), false),
+                                             InstanceBuilders.BuildConcrete("Custard", 3, new DateTime(2003, 01, 01), true),
+                                             InstanceBuilders.BuildConcrete("Dogfood", 4, new DateTime(2004, 01, 01), true),
+                                             InstanceBuilders.BuildConcrete("Eggs", 5, new DateTime(2005, 01, 01), true)
+                                         };
+
+            complexCollection = new List<ComplexClass>
+                                         {
+                                             new ComplexClass { Title = "Charles", Concrete = InstanceBuilders.BuildConcrete("Apple", 5, new DateTime(2005, 01, 01), true) },
+                                             new ComplexClass { Title = "Andrew", Concrete = InstanceBuilders.BuildConcrete("Custard", 3, new DateTime(2007, 01, 01), true) },
+                                             new ComplexClass { Title = "David", Concrete = InstanceBuilders.BuildConcrete("Banana", 2, new DateTime(2003, 01, 01), false) },
+                                             new ComplexClass { Title = "Edward", Concrete = InstanceBuilders.BuildConcrete("Eggs", 1, new DateTime(2000, 01, 01), true) },
+                                             new ComplexClass { Title = "Boris", Concrete = InstanceBuilders.BuildConcrete("Dogfood", 4, new DateTime(2009, 01, 01), false) }
+                                         };
+
+            nullableCollection = new List<NullableClass>
+                                     {
+                                         InstanceBuilders.BuildNull(),
+                                         InstanceBuilders.BuildNull(1, new DateTime(2002, 01, 01), true, 10000000000, 111.111, 111.111f, 0x00, guidArray[0])
+                                     };
+        }
+    }
+    [TestFixture]
+    public class When_aggregating_single_numeric_property_with_sum_as_total : Aggregations
+    {
+        private IQueryable<Dictionary<string, object>> _result;
+        [SetUp]
+        public void Setup()
+        {
+            // establish context
+            CreateContext();
+            _result = concreteCollection.AsQueryable()
+                .LinqToQuerystring<ConcreteClass, IQueryable<Dictionary<string, object>>>("?$apply=aggregate(Age with sum as Total)");
+            
+        }
+
+        [Test]
+        public void Should_have_the_projected_property_in_the_dictionary()
+        {
+            Assert.IsTrue(_result.All(r => r.ContainsKey("Total")));
+        }
+
+        [Test]
+        public void Should_have_exactly_one_property()
+        {
+            Assert.IsTrue(_result.All(r => r.Count == 1));
+        }
+
+        [Test]
+        public void Should_have_the_correct_sum()
+        {
+            Assert.IsTrue((int)_result.ElementAt(0)["Total"] == 5);
+            Assert.IsTrue((int)_result.ElementAt(1)["Total"] == 10);
+            Assert.IsTrue((int)_result.ElementAt(2)["Total"] == 15);
+            Assert.IsTrue((int)_result.ElementAt(3)["Total"] == 20);
+            Assert.IsTrue((int)_result.ElementAt(4)["Total"] == 25);
+        }
+    }
+
+    [TestFixture]
+    public class When_aggregating_single_numeric_property_with_avg_as_average : Aggregations
+    {
+        private IQueryable<Dictionary<string, object>> _result;
+        [SetUp]
+        public void Setup()
+        {
+            // establish context
+            CreateContext();
+            _result = concreteCollection.AsQueryable()
+                .LinqToQuerystring<ConcreteClass, IQueryable<Dictionary<string, object>>>("?$apply=aggregate(Age with average as AverageAge)");
+
+        }
+
+        [Test]
+        public void Should_have_the_projected_property_in_the_dictionary()
+        {
+            Assert.IsTrue(_result.All(r => r.ContainsKey("AverageAge")));
+        }
+
+        [Test]
+        public void Should_have_exactly_one_property()
+        {
+            Assert.IsTrue(_result.All(r => r.Count == 1));
+        }
+
+        [Test]
+        public void Should_have_the_correct_average()
+        {
+            Assert.IsTrue((double)_result.ElementAt(0)["AverageAge"] == 1);
+            Assert.IsTrue((double)_result.ElementAt(1)["AverageAge"] == 2);
+            Assert.IsTrue((double)_result.ElementAt(2)["AverageAge"] == 3);
+            Assert.IsTrue((double)_result.ElementAt(3)["AverageAge"] == 4);
+            Assert.IsTrue((double)_result.ElementAt(4)["AverageAge"] == 5);
+        }
+    }
+
+    [TestFixture]
+    public class When_aggregating_single_numeric_property_with_max_as_average : Aggregations
+    {
+        private IQueryable<Dictionary<string, object>> _result;
+        [SetUp]
+        public void Setup()
+        {
+            // establish context
+            CreateContext();
+            _result = concreteCollection.AsQueryable()
+                .LinqToQuerystring<ConcreteClass, IQueryable<Dictionary<string, object>>>("?$apply=aggregate(Age with max as MaxAge)");
+
+        }
+
+        [Test]
+        public void Should_have_the_projected_property_in_the_dictionary()
+        {
+            Assert.IsTrue(_result.All(r => r.ContainsKey("MaxAge")));
+        }
+
+        [Test]
+        public void Should_have_exactly_one_property()
+        {
+            Assert.IsTrue(_result.All(r => r.Count == 1));
+        }
+
+        [Test]
+        public void Should_have_the_correct_max()
+        {
+            Assert.IsTrue((int)_result.ElementAt(0)["MaxAge"] == 1);
+            Assert.IsTrue((int)_result.ElementAt(1)["MaxAge"] == 2);
+            Assert.IsTrue((int)_result.ElementAt(2)["MaxAge"] == 3);
+            Assert.IsTrue((int)_result.ElementAt(3)["MaxAge"] == 4);
+            Assert.IsTrue((int)_result.ElementAt(4)["MaxAge"] == 5);
+        }
+    }
+
+
+    [TestFixture]
+    public class When_aggregating_single_numeric_property_with_min_as_average : Aggregations
+    {
+        private IQueryable<Dictionary<string, object>> _result;
+        [SetUp]
+        public void Setup()
+        {
+            // establish context
+            CreateContext();
+            _result = concreteCollection.AsQueryable()
+                .LinqToQuerystring<ConcreteClass, IQueryable<Dictionary<string, object>>>("?$apply=aggregate(Age with min as MinAge)");
+
+        }
+
+        [Test]
+        public void Should_have_the_projected_property_in_the_dictionary()
+        {
+            Assert.IsTrue(_result.All(r => r.ContainsKey("MinAge")));
+        }
+
+        [Test]
+        public void Should_have_exactly_one_property()
+        {
+            Assert.IsTrue(_result.All(r => r.Count == 1));
+        }
+
+        [Test]
+        public void Should_have_the_correct_max()
+        {
+            Assert.IsTrue((int)_result.ElementAt(0)["MinAge"] == 1);
+            Assert.IsTrue((int)_result.ElementAt(1)["MinAge"] == 2);
+            Assert.IsTrue((int)_result.ElementAt(2)["MinAge"] == 3);
+            Assert.IsTrue((int)_result.ElementAt(3)["MinAge"] == 4);
+            Assert.IsTrue((int)_result.ElementAt(4)["MinAge"] == 5);
+        }
+    }
+
+    [TestFixture]
+    public class When_aggregating_multiple_properties : Aggregations
+    {
+        private IQueryable<Dictionary<string, object>> _result;
+        [SetUp]
+        public void Setup()
+        {
+            // establish context
+            CreateContext();
+            _result = concreteCollection.AsQueryable()
+                .LinqToQuerystring<ConcreteClass, IQueryable<Dictionary<string, object>>>("?$apply=aggregate(Age with min as MinAge,Age with sum as TotalAge)");
+
+        }
+
+        [Test]
+        public void Should_have_the_projected_property_in_the_dictionary()
+        {
+            Assert.IsTrue(_result.All(r => r.ContainsKey("MinAge") && r.ContainsKey("TotalAge")));
+        }
+
+        [Test]
+        public void Should_have_exactly_two_property()
+        {
+            Assert.IsTrue(_result.All(r => r.Count == 2));
+        }
+
+        [Test]
+        public void Should_have_the_correct_max()
+        {
+            Assert.IsTrue((int)_result.ElementAt(0)["MinAge"] == 1);
+            Assert.IsTrue((int)_result.ElementAt(1)["MinAge"] == 2);
+            Assert.IsTrue((int)_result.ElementAt(2)["MinAge"] == 3);
+            Assert.IsTrue((int)_result.ElementAt(3)["MinAge"] == 4);
+            Assert.IsTrue((int)_result.ElementAt(4)["MinAge"] == 5);
+
+            Assert.IsTrue((int)_result.ElementAt(0)["TotalAge"] == 5);
+            Assert.IsTrue((int)_result.ElementAt(1)["TotalAge"] == 10);
+            Assert.IsTrue((int)_result.ElementAt(2)["TotalAge"] == 15);
+            Assert.IsTrue((int)_result.ElementAt(3)["TotalAge"] == 20);
+            Assert.IsTrue((int)_result.ElementAt(4)["TotalAge"] == 25);
+        }
+    }
+}
diff --git a/LinqToQueryString.UnitTests/Nunit/Projection.cs b/LinqToQueryString.UnitTests/Nunit/Projection.cs
new file mode 100644
index 0000000..e96554f
--- /dev/null
+++ b/LinqToQueryString.UnitTests/Nunit/Projection.cs
@@ -0,0 +1,142 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using LinqToQuerystring;
+using LinqToQueryString.Tests;
+using NUnit.Framework;
+
+namespace LinqToQueryString.UnitTests.Nunit
+{
+
+    [TestFixture]
+    public class When_selecting_a_complex_int_property : Projection
+    {
+        private IQueryable<Dictionary<string, object>> _result;
+        [SetUp]
+        public void Setup()
+        {
+            // establish context
+            context();
+            _result = complexCollection.AsQueryable()
+                .LinqToQuerystring<ComplexClass, IQueryable<Dictionary<string, object>>>("?$select=Concrete/Id");
+        }
+
+        [Test]
+        public void Should_have_the_projected_property_in_the_dictionary()
+        {
+            Assert.IsTrue(_result.All(r => r.ContainsKey("Concrete_Id")));
+        }
+
+        [Test]
+        public void Should_have_exactly_one_property()
+        {
+            Assert.IsTrue(_result.All(r => r.Count == 1));
+        }
+    }
+
+    [TestFixture]
+    public class When_selecting_two_complex_properties : Projection
+    {
+        private IQueryable<Dictionary<string, object>> _result;
+        [SetUp]
+        public void Setup()
+        {
+            // establish context
+            context();
+            _result = complexCollection.AsQueryable()
+                .LinqToQuerystring<ComplexClass, IQueryable<Dictionary<string, object>>>("?$select=Concrete/Id,Concrete/Name");
+        }
+
+        [Test]
+        public void Should_have_the_projected_property_in_the_dictionary()
+        {
+            Assert.IsTrue(_result.All(r => r.ContainsKey("Concrete_Id") && r.ContainsKey("Concrete_Name")));
+        }
+
+        [Test]
+        public void Should_have_exactly_two_property()
+        {
+            Assert.IsTrue(_result.All(r => r.Count == 2));
+        }
+    }
+
+    [TestFixture]
+    public class When_selecting_int_property_with_rename : Projection
+    {
+        private IQueryable<Dictionary<string, object>> _result;
+        [SetUp]
+        public void Setup()
+        {
+            // establish context
+            context();
+            _result = concreteCollection.AsQueryable()
+                .LinqToQuerystring<ConcreteClass, IQueryable<Dictionary<string, object>>>("?$select=Id as PID");
+        }
+
+        [Test]
+        public void Should_have_the_projected_property_in_the_dictionary()
+        {
+            Assert.IsTrue(_result.All(r => r.ContainsKey("PID")));
+        }
+
+        [Test]
+        public void Should_have_exactly_one_property()
+        {
+            Assert.IsTrue(_result.All(r => r.Count == 1));
+        }
+    }
+
+    [TestFixture]
+    public class When_selecting_multiple_properties_with_rename : Projection
+    {
+        private IQueryable<Dictionary<string, object>> _result;
+        [SetUp]
+        public void Setup()
+        {
+            // establish context
+            context();
+            _result = concreteCollection.AsQueryable()
+                .LinqToQuerystring<ConcreteClass, IQueryable<Dictionary<string, object>>>("?$select=Id as PID,Name as DisplayName");
+        }
+
+        [Test]
+        public void Should_have_the_projected_property_in_the_dictionary()
+        {
+            Assert.IsTrue(_result.All(r => r.ContainsKey("PID") && r.ContainsKey("DisplayName")));
+        }
+
+        [Test]
+        public void Should_have_exactly_two_property()
+        {
+            Assert.IsTrue(_result.All(r => r.Count == 2));
+        }
+    }
+
+    [TestFixture]
+    public class When_selecting_multiple_complex_properties_with_rename : Projection
+    {
+        private IQueryable<Dictionary<string, object>> _result;
+        [SetUp]
+        public void Setup()
+        {
+            // establish context
+            context();
+            _result = complexCollection.AsQueryable()
+                .LinqToQuerystring<ComplexClass, IQueryable<Dictionary<string, object>>>("?$select=Concrete/Id,Concrete/Name as DisplayName");
+        }
+
+        [Test]
+        public void Should_have_the_projected_property_in_the_dictionary()
+        {
+            Assert.IsTrue(_result.All(r => r.ContainsKey("Concrete_Id") && r.ContainsKey("DisplayName")));
+        }
+
+        [Test]
+        public void Should_have_exactly_two_property()
+        {
+            Assert.IsTrue(_result.All(r => r.Count == 2));
+        }
+    }
+}
diff --git a/LinqToQueryString.UnitTests/Projection.cs b/LinqToQueryString.UnitTests/Projection.cs
index 4ad05b5..125e629 100644
--- a/LinqToQueryString.UnitTests/Projection.cs
+++ b/LinqToQueryString.UnitTests/Projection.cs
@@ -1,4 +1,6 @@
-namespace LinqToQueryString.UnitTests
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace LinqToQueryString.UnitTests
 {
     using System;
     using System.Collections.Generic;
@@ -28,7 +30,7 @@ public abstract class Projection
 
         protected static Guid[] guidArray;
 
-        private Establish context = () =>
+        protected Establish context = () =>
         {
             guidArray = Enumerable.Range(1, 5).Select(o => Guid.NewGuid()).ToArray();
 
@@ -223,7 +225,30 @@ public class When_selecting_a_nullable_int_property : Projection
 
     #region Complex Property Tests
 
+    public class When_selecting_a_single_complex_string_property : Projection
+    {
+        private Because of =
+            () =>
+                result = concreteCollection.AsQueryable().LinqToQuerystring<ConcreteClass, IQueryable<Dictionary<string, object>>>("?$select=Name");
+
+        private It should_project_the_name_properties_into_the_dictionary =
+            () => result.ShouldEachConformTo(r => r.ContainsKey("Name"));
+
+        private It should_only_have_projected_the_one_property =
+            () => result.ShouldEachConformTo(r => r.Count == 1);
+
+        private It should_contain_5_results = () => result.Count().ShouldEqual(5);
+
+        private It should_start_with_the_first_record = () => result.ElementAt(0)["Name"].ShouldEqual(concreteCollection.ElementAt(0).Name);
 
+        private It should_be_followed_by_the_second_record = () => result.ElementAt(1)["Name"].ShouldEqual(concreteCollection.ElementAt(1).Name);
+
+        private It should_be_followed_by_the_third_record = () => result.ElementAt(2)["Name"].ShouldEqual(concreteCollection.ElementAt(2).Name);
+
+        private It should_be_followed_by_the_fourth_record = () => result.ElementAt(3)["Name"].ShouldEqual(concreteCollection.ElementAt(3).Name);
+
+        private It should_be_followed_by_the_fifth_record = () => result.ElementAt(4)["Name"].ShouldEqual(concreteCollection.ElementAt(4).Name);
+    }
 
     #endregion
 
diff --git a/LinqToQueryString.UnitTests/packages.config b/LinqToQueryString.UnitTests/packages.config
index fea2b6a..605a209 100644
--- a/LinqToQueryString.UnitTests/packages.config
+++ b/LinqToQueryString.UnitTests/packages.config
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Machine.Specifications" version="0.7.0-Unstable0077" targetFramework="net35" />
-  <package id="Machine.Specifications.Should" version="0.7.0-Unstable0008" targetFramework="net35" />
-  <package id="Moq" version="4.1.1309.1617" targetFramework="net35" />
+  <package id="Machine.Specifications" version="0.7.0-Unstable0077" targetFramework="net35" requireReinstallation="true" />
+  <package id="Machine.Specifications.Runner.Console" version="0.9.3" targetFramework="net462" />
+  <package id="Machine.Specifications.Runner.VisualStudio" version="2.8.0" targetFramework="net462" />
+  <package id="Machine.Specifications.Should" version="0.7.0-Unstable0008" targetFramework="net35" requireReinstallation="true" />
+  <package id="Microsoft.CodeCoverage" version="16.0.1" targetFramework="net462" />
+  <package id="Microsoft.NET.Test.Sdk" version="16.0.1" targetFramework="net462" />
+  <package id="Mono.Cecil" version="0.10.0" targetFramework="net462" />
+  <package id="Moq" version="4.1.1309.1617" targetFramework="net35" requireReinstallation="true" />
+  <package id="NUnit" version="3.11.0" targetFramework="net462" />
 </packages>
\ No newline at end of file
diff --git a/LinqToQuerystring.IntegrationTests.Mongo/LinqToQuerystring.IntegrationTests.Mongo.csproj b/LinqToQuerystring.IntegrationTests.Mongo/LinqToQuerystring.IntegrationTests.Mongo.csproj
index b9a8abf..117b19f 100644
--- a/LinqToQuerystring.IntegrationTests.Mongo/LinqToQuerystring.IntegrationTests.Mongo.csproj
+++ b/LinqToQuerystring.IntegrationTests.Mongo/LinqToQuerystring.IntegrationTests.Mongo.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>LinqToQuerystring.IntegrationTests.Mongo</RootNamespace>
     <AssemblyName>LinqToQuerystring.IntegrationTests.Mongo</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
@@ -23,6 +23,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -31,6 +32,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Machine.Specifications, Version=0.7.0.0, Culture=neutral, processorArchitecture=MSIL">
diff --git a/LinqToQuerystring.IntegrationTests.Mongo/packages.config b/LinqToQuerystring.IntegrationTests.Mongo/packages.config
index a43a767..0bf86ca 100644
--- a/LinqToQuerystring.IntegrationTests.Mongo/packages.config
+++ b/LinqToQuerystring.IntegrationTests.Mongo/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Machine.Specifications" version="0.7.0-Unstable0077" targetFramework="net35" />
-  <package id="Machine.Specifications.Should" version="0.7.0-Unstable0008" targetFramework="net35" />
+  <package id="Machine.Specifications" version="0.7.0-Unstable0077" targetFramework="net35" requireReinstallation="true" />
+  <package id="Machine.Specifications.Should" version="0.7.0-Unstable0008" targetFramework="net35" requireReinstallation="true" />
   <package id="mongocsharp.linqindexers" version="1.8.1.1" targetFramework="net35" />
   <package id="mongocsharpdriver" version="1.8.2" targetFramework="net35" />
   <package id="Ninject" version="3.0.2-unstable-9" targetFramework="net45" />
diff --git a/LinqToQuerystring/LinqToQuerystring.csproj b/LinqToQuerystring/LinqToQuerystring.csproj
index b2ee748..81513d4 100644
--- a/LinqToQuerystring/LinqToQuerystring.csproj
+++ b/LinqToQuerystring/LinqToQuerystring.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>LinqToQuerystring</RootNamespace>
     <AssemblyName>LinqToQuerystring</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
@@ -23,6 +23,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -31,6 +32,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Antlr3.Runtime, Version=3.5.0.2, Culture=neutral, PublicKeyToken=eb42632606e9261f, processorArchitecture=MSIL">
@@ -53,6 +55,9 @@
     <Compile Include="TreeNodes\Aggregates\AverageNode.cs" />
     <Compile Include="TreeNodes\Aggregates\MinNode.cs" />
     <Compile Include="TreeNodes\Aggregates\CountNode.cs" />
+    <Compile Include="TreeNodes\Apply\ApplyNode.cs" />
+    <Compile Include="TreeNodes\Apply\WithNode.cs" />
+    <Compile Include="TreeNodes\AsNode.cs" />
     <Compile Include="TreeNodes\AliasNode.cs" />
     <Compile Include="TreeNodes\AndNode.cs" />
     <Compile Include="TreeNodes\AscNode.cs" />
@@ -64,6 +69,7 @@
     <Compile Include="TreeNodes\DataTypes\BoolNode.cs" />
     <Compile Include="TreeNodes\DataTypes\ByteNode.cs" />
     <Compile Include="TreeNodes\DataTypes\DecimalNode.cs" />
+    <Compile Include="TreeNodes\Apply\AggregateNode.cs" />
     <Compile Include="TreeNodes\Functions\DayNode.cs" />
     <Compile Include="TreeNodes\Functions\DaysNode.cs" />
     <Compile Include="Exceptions\FunctionNotSupportedException.cs" />
diff --git a/LinqToQuerystring/LinqToQuerystring.g b/LinqToQuerystring/LinqToQuerystring.g
index 80ea75d..f7a199b 100644
--- a/LinqToQuerystring/LinqToQuerystring.g
+++ b/LinqToQuerystring/LinqToQuerystring.g
@@ -33,7 +33,7 @@ public override void ReportError(RecognitionException e) {
 public prog
 	:	(param ('&'! param)*)*;
 
-param	:	(orderby | top | skip | filter | select | inlinecount | expand | ignored);
+param	:	(orderby | top | skip | filter | select | inlinecount | expand | ignored | apply);
 
 skip	
 	:	SKIP^ INT+;
@@ -45,8 +45,32 @@ filter
 	:	FILTER^ filterexpression[false];
 	
 select
-	:	SELECT^ propertyname[false] (','! propertyname[false])*;
+	:	SELECT^ propertyname[false] (SPACE! asexp)? (','! propertyname[false] (SPACE! asexp)?)*;
 			
+asexp
+	:	AS^ SPACE! IDENTIFIER;
+
+apply
+	:	APPLY^ aggexpr;
+
+aggexpr
+	:	applyTrafo ('/'! applyTrafo)*;
+
+applyTrafo
+	:	aggregateTrafo;
+
+aggregateTrafo
+	:	AGGREGATE^ '(' aggregateExpr (','! aggregateExpr)*')';
+
+aggregateExpr
+	:	propertyname[false] SPACE! aggregateWith SPACE! asexp; 
+
+aggregateWith
+	:	WITH^ SPACE! aggregateMethod;
+
+aggregateMethod
+	:	MAX | MIN | SUM | AVERAGE;
+
 expand
 	:	EXPAND^ propertyname[false] (','! propertyname[false])*;
 
@@ -177,6 +201,12 @@ ORDERBY
 	
 SELECT
 	:	'$select=';
+
+APPLY
+	:	'$apply=';
+
+AGGREGATE
+	:	'aggregate';
 	
 INLINECOUNT
 	:	'$inlinecount=';
@@ -246,6 +276,10 @@ MAX	:	'max';
 SUM	:	'sum';
 
 AVERAGE	:	'average';
+
+AS: 'as';
+
+WITH: 'with';
 		
 INT	:	('-')? '0'..'9'+;
 	
@@ -281,7 +315,7 @@ HEX_PAIR
 	
 IDENTIFIER
 	:	('a'..'z'|'A'..'Z') ('a'..'z'|'A'..'Z'|'0'..'9'|'_')*;
-	
+
 STRING 	: 	'\'' (ESC_SEQ| ~('\\'|'\''))* '\'';
 
 fragment
diff --git a/LinqToQuerystring/LinqToQuerystring.tokens b/LinqToQuerystring/LinqToQuerystring.tokens
index 0a7a300..a6b5851 100644
--- a/LinqToQuerystring/LinqToQuerystring.tokens
+++ b/LinqToQuerystring/LinqToQuerystring.tokens
@@ -1,78 +1,82 @@
-T__70=70
-T__71=71
-T__72=72
-T__73=73
 T__74=74
 T__75=75
-ALIAS=4
-ALL=5
-ALLPAGES=6
-AND=7
-ANY=8
-ASC=9
-ASSIGN=10
-AVERAGE=11
-BOOL=12
-BYTE=13
-COUNT=14
-DATETIME=15
-DAY=16
-DAYS=17
-DECIMAL=18
-DESC=19
-DOUBLE=20
-DYNAMICIDENTIFIER=21
-ENDSWITH=22
-EQUALS=23
-ESC_SEQ=24
-EXPAND=25
-FILTER=26
-GREATERTHAN=27
-GREATERTHANOREQUAL=28
-GUID=29
-HEX_DIGIT=30
-HEX_PAIR=31
-HOUR=32
-HOURS=33
-IDENTIFIER=34
-IGNORED=35
-INLINECOUNT=36
-INT=37
-LESSTHAN=38
-LESSTHANOREQUAL=39
-LONG=40
-MAX=41
-MIN=42
-MINUTE=43
-MINUTES=44
-MONTH=45
-NEWLINE=46
-NONE=47
-NOT=48
-NOTEQUALS=49
-NULL=50
-OCTAL_ESC=51
-OR=52
-ORDERBY=53
-SECOND=54
-SECONDS=55
-SELECT=56
-SINGLE=57
-SKIP=58
-SPACE=59
-STARTSWITH=60
-STRING=61
-SUBSTRINGOF=62
-SUM=63
-TOLOWER=64
-TOP=65
-TOUPPER=66
-UNICODE_ESC=67
-YEAR=68
-YEARS=69
-'&'=70
-'('=71
-')'=72
-','=73
-'/'=74
-':'=75
+T__76=76
+T__77=77
+T__78=78
+T__79=79
+AGGREGATE=4
+ALIAS=5
+ALL=6
+ALLPAGES=7
+AND=8
+ANY=9
+APPLY=10
+AS=11
+ASC=12
+ASSIGN=13
+AVERAGE=14
+BOOL=15
+BYTE=16
+COUNT=17
+DATETIME=18
+DAY=19
+DAYS=20
+DECIMAL=21
+DESC=22
+DOUBLE=23
+DYNAMICIDENTIFIER=24
+ENDSWITH=25
+EQUALS=26
+ESC_SEQ=27
+EXPAND=28
+FILTER=29
+GREATERTHAN=30
+GREATERTHANOREQUAL=31
+GUID=32
+HEX_DIGIT=33
+HEX_PAIR=34
+HOUR=35
+HOURS=36
+IDENTIFIER=37
+IGNORED=38
+INLINECOUNT=39
+INT=40
+LESSTHAN=41
+LESSTHANOREQUAL=42
+LONG=43
+MAX=44
+MIN=45
+MINUTE=46
+MINUTES=47
+MONTH=48
+NEWLINE=49
+NONE=50
+NOT=51
+NOTEQUALS=52
+NULL=53
+OCTAL_ESC=54
+OR=55
+ORDERBY=56
+SECOND=57
+SECONDS=58
+SELECT=59
+SINGLE=60
+SKIP=61
+SPACE=62
+STARTSWITH=63
+STRING=64
+SUBSTRINGOF=65
+SUM=66
+TOLOWER=67
+TOP=68
+TOUPPER=69
+UNICODE_ESC=70
+WITH=71
+YEAR=72
+YEARS=73
+'&'=74
+'('=75
+')'=76
+','=77
+'/'=78
+':'=79
diff --git a/LinqToQuerystring/LinqToQuerystringLexer.cs b/LinqToQuerystring/LinqToQuerystringLexer.cs
index 740babc..aad84f0 100644
--- a/LinqToQuerystring/LinqToQuerystringLexer.cs
+++ b/LinqToQuerystring/LinqToQuerystringLexer.cs
@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-// $ANTLR 3.5.0.2 C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g 2014-04-18 09:38:51
+// $ANTLR 3.5.0.2 C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g 2019-03-07 21:48:01
 
 // The variable 'variable' is assigned but its value is never used.
 #pragma warning disable 219
@@ -34,78 +34,82 @@ namespace  LinqToQuerystring
 public partial class LinqToQuerystringLexer : Antlr.Runtime.Lexer
 {
 	public const int EOF=-1;
-	public const int ALIAS=4;
-	public const int ALL=5;
-	public const int ALLPAGES=6;
-	public const int AND=7;
-	public const int ANY=8;
-	public const int ASC=9;
-	public const int ASSIGN=10;
-	public const int AVERAGE=11;
-	public const int BOOL=12;
-	public const int BYTE=13;
-	public const int COUNT=14;
-	public const int DATETIME=15;
-	public const int DAY=16;
-	public const int DAYS=17;
-	public const int DECIMAL=18;
-	public const int DESC=19;
-	public const int DOUBLE=20;
-	public const int DYNAMICIDENTIFIER=21;
-	public const int ENDSWITH=22;
-	public const int EQUALS=23;
-	public const int ESC_SEQ=24;
-	public const int EXPAND=25;
-	public const int FILTER=26;
-	public const int GREATERTHAN=27;
-	public const int GREATERTHANOREQUAL=28;
-	public const int GUID=29;
-	public const int HEX_DIGIT=30;
-	public const int HEX_PAIR=31;
-	public const int HOUR=32;
-	public const int HOURS=33;
-	public const int IDENTIFIER=34;
-	public const int IGNORED=35;
-	public const int INLINECOUNT=36;
-	public const int INT=37;
-	public const int LESSTHAN=38;
-	public const int LESSTHANOREQUAL=39;
-	public const int LONG=40;
-	public const int MAX=41;
-	public const int MIN=42;
-	public const int MINUTE=43;
-	public const int MINUTES=44;
-	public const int MONTH=45;
-	public const int NEWLINE=46;
-	public const int NONE=47;
-	public const int NOT=48;
-	public const int NOTEQUALS=49;
-	public const int NULL=50;
-	public const int OCTAL_ESC=51;
-	public const int OR=52;
-	public const int ORDERBY=53;
-	public const int SECOND=54;
-	public const int SECONDS=55;
-	public const int SELECT=56;
-	public const int SINGLE=57;
-	public const int SKIP=58;
-	public const int SPACE=59;
-	public const int STARTSWITH=60;
-	public const int STRING=61;
-	public const int SUBSTRINGOF=62;
-	public const int SUM=63;
-	public const int TOLOWER=64;
-	public const int TOP=65;
-	public const int TOUPPER=66;
-	public const int UNICODE_ESC=67;
-	public const int YEAR=68;
-	public const int YEARS=69;
-	public const int T__70=70;
-	public const int T__71=71;
-	public const int T__72=72;
-	public const int T__73=73;
+	public const int AGGREGATE=4;
+	public const int ALIAS=5;
+	public const int ALL=6;
+	public const int ALLPAGES=7;
+	public const int AND=8;
+	public const int ANY=9;
+	public const int APPLY=10;
+	public const int AS=11;
+	public const int ASC=12;
+	public const int ASSIGN=13;
+	public const int AVERAGE=14;
+	public const int BOOL=15;
+	public const int BYTE=16;
+	public const int COUNT=17;
+	public const int DATETIME=18;
+	public const int DAY=19;
+	public const int DAYS=20;
+	public const int DECIMAL=21;
+	public const int DESC=22;
+	public const int DOUBLE=23;
+	public const int DYNAMICIDENTIFIER=24;
+	public const int ENDSWITH=25;
+	public const int EQUALS=26;
+	public const int ESC_SEQ=27;
+	public const int EXPAND=28;
+	public const int FILTER=29;
+	public const int GREATERTHAN=30;
+	public const int GREATERTHANOREQUAL=31;
+	public const int GUID=32;
+	public const int HEX_DIGIT=33;
+	public const int HEX_PAIR=34;
+	public const int HOUR=35;
+	public const int HOURS=36;
+	public const int IDENTIFIER=37;
+	public const int IGNORED=38;
+	public const int INLINECOUNT=39;
+	public const int INT=40;
+	public const int LESSTHAN=41;
+	public const int LESSTHANOREQUAL=42;
+	public const int LONG=43;
+	public const int MAX=44;
+	public const int MIN=45;
+	public const int MINUTE=46;
+	public const int MINUTES=47;
+	public const int MONTH=48;
+	public const int NEWLINE=49;
+	public const int NONE=50;
+	public const int NOT=51;
+	public const int NOTEQUALS=52;
+	public const int NULL=53;
+	public const int OCTAL_ESC=54;
+	public const int OR=55;
+	public const int ORDERBY=56;
+	public const int SECOND=57;
+	public const int SECONDS=58;
+	public const int SELECT=59;
+	public const int SINGLE=60;
+	public const int SKIP=61;
+	public const int SPACE=62;
+	public const int STARTSWITH=63;
+	public const int STRING=64;
+	public const int SUBSTRINGOF=65;
+	public const int SUM=66;
+	public const int TOLOWER=67;
+	public const int TOP=68;
+	public const int TOUPPER=69;
+	public const int UNICODE_ESC=70;
+	public const int WITH=71;
+	public const int YEAR=72;
+	public const int YEARS=73;
 	public const int T__74=74;
 	public const int T__75=75;
+	public const int T__76=76;
+	public const int T__77=77;
+	public const int T__78=78;
+	public const int T__79=79;
 
 	public override void ReportError(RecognitionException e) {
 		if (this.input.LT(1) == '\\')
@@ -137,30 +141,30 @@ public LinqToQuerystringLexer(ICharStream input, RecognizerSharedState state)
 
 		OnCreated();
 	}
-	public override string GrammarFileName { get { return "C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g"; } }
+	public override string GrammarFileName { get { return "C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g"; } }
 
 
 	partial void OnCreated();
 	partial void EnterRule(string ruleName, int ruleIndex);
 	partial void LeaveRule(string ruleName, int ruleIndex);
 
-	partial void EnterRule_T__70();
-	partial void LeaveRule_T__70();
+	partial void EnterRule_T__74();
+	partial void LeaveRule_T__74();
 
-	// $ANTLR start "T__70"
-	[GrammarRule("T__70")]
-	private void mT__70()
+	// $ANTLR start "T__74"
+	[GrammarRule("T__74")]
+	private void mT__74()
 	{
-		EnterRule_T__70();
-		EnterRule("T__70", 1);
-		TraceIn("T__70", 1);
+		EnterRule_T__74();
+		EnterRule("T__74", 1);
+		TraceIn("T__74", 1);
 		try
 		{
-			int _type = T__70;
+			int _type = T__74;
 			int _channel = DefaultTokenChannel;
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:23:7: ( '&' )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:23:7: ( '&' )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:23:9: '&'
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:23:9: '&'
 			{
 			DebugLocation(23, 9);
 			Match('&'); 
@@ -172,30 +176,30 @@ private void mT__70()
 		}
 		finally
 		{
-			TraceOut("T__70", 1);
-			LeaveRule("T__70", 1);
-			LeaveRule_T__70();
+			TraceOut("T__74", 1);
+			LeaveRule("T__74", 1);
+			LeaveRule_T__74();
 		}
 	}
-	// $ANTLR end "T__70"
+	// $ANTLR end "T__74"
 
-	partial void EnterRule_T__71();
-	partial void LeaveRule_T__71();
+	partial void EnterRule_T__75();
+	partial void LeaveRule_T__75();
 
-	// $ANTLR start "T__71"
-	[GrammarRule("T__71")]
-	private void mT__71()
+	// $ANTLR start "T__75"
+	[GrammarRule("T__75")]
+	private void mT__75()
 	{
-		EnterRule_T__71();
-		EnterRule("T__71", 2);
-		TraceIn("T__71", 2);
+		EnterRule_T__75();
+		EnterRule("T__75", 2);
+		TraceIn("T__75", 2);
 		try
 		{
-			int _type = T__71;
+			int _type = T__75;
 			int _channel = DefaultTokenChannel;
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:24:7: ( '(' )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:24:7: ( '(' )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:24:9: '('
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:24:9: '('
 			{
 			DebugLocation(24, 9);
 			Match('('); 
@@ -207,30 +211,30 @@ private void mT__71()
 		}
 		finally
 		{
-			TraceOut("T__71", 2);
-			LeaveRule("T__71", 2);
-			LeaveRule_T__71();
+			TraceOut("T__75", 2);
+			LeaveRule("T__75", 2);
+			LeaveRule_T__75();
 		}
 	}
-	// $ANTLR end "T__71"
+	// $ANTLR end "T__75"
 
-	partial void EnterRule_T__72();
-	partial void LeaveRule_T__72();
+	partial void EnterRule_T__76();
+	partial void LeaveRule_T__76();
 
-	// $ANTLR start "T__72"
-	[GrammarRule("T__72")]
-	private void mT__72()
+	// $ANTLR start "T__76"
+	[GrammarRule("T__76")]
+	private void mT__76()
 	{
-		EnterRule_T__72();
-		EnterRule("T__72", 3);
-		TraceIn("T__72", 3);
+		EnterRule_T__76();
+		EnterRule("T__76", 3);
+		TraceIn("T__76", 3);
 		try
 		{
-			int _type = T__72;
+			int _type = T__76;
 			int _channel = DefaultTokenChannel;
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:25:7: ( ')' )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:25:7: ( ')' )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:25:9: ')'
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:25:9: ')'
 			{
 			DebugLocation(25, 9);
 			Match(')'); 
@@ -242,30 +246,30 @@ private void mT__72()
 		}
 		finally
 		{
-			TraceOut("T__72", 3);
-			LeaveRule("T__72", 3);
-			LeaveRule_T__72();
+			TraceOut("T__76", 3);
+			LeaveRule("T__76", 3);
+			LeaveRule_T__76();
 		}
 	}
-	// $ANTLR end "T__72"
+	// $ANTLR end "T__76"
 
-	partial void EnterRule_T__73();
-	partial void LeaveRule_T__73();
+	partial void EnterRule_T__77();
+	partial void LeaveRule_T__77();
 
-	// $ANTLR start "T__73"
-	[GrammarRule("T__73")]
-	private void mT__73()
+	// $ANTLR start "T__77"
+	[GrammarRule("T__77")]
+	private void mT__77()
 	{
-		EnterRule_T__73();
-		EnterRule("T__73", 4);
-		TraceIn("T__73", 4);
+		EnterRule_T__77();
+		EnterRule("T__77", 4);
+		TraceIn("T__77", 4);
 		try
 		{
-			int _type = T__73;
+			int _type = T__77;
 			int _channel = DefaultTokenChannel;
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:26:7: ( ',' )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:26:7: ( ',' )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:26:9: ','
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:26:9: ','
 			{
 			DebugLocation(26, 9);
 			Match(','); 
@@ -277,30 +281,30 @@ private void mT__73()
 		}
 		finally
 		{
-			TraceOut("T__73", 4);
-			LeaveRule("T__73", 4);
-			LeaveRule_T__73();
+			TraceOut("T__77", 4);
+			LeaveRule("T__77", 4);
+			LeaveRule_T__77();
 		}
 	}
-	// $ANTLR end "T__73"
+	// $ANTLR end "T__77"
 
-	partial void EnterRule_T__74();
-	partial void LeaveRule_T__74();
+	partial void EnterRule_T__78();
+	partial void LeaveRule_T__78();
 
-	// $ANTLR start "T__74"
-	[GrammarRule("T__74")]
-	private void mT__74()
+	// $ANTLR start "T__78"
+	[GrammarRule("T__78")]
+	private void mT__78()
 	{
-		EnterRule_T__74();
-		EnterRule("T__74", 5);
-		TraceIn("T__74", 5);
+		EnterRule_T__78();
+		EnterRule("T__78", 5);
+		TraceIn("T__78", 5);
 		try
 		{
-			int _type = T__74;
+			int _type = T__78;
 			int _channel = DefaultTokenChannel;
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:27:7: ( '/' )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:27:7: ( '/' )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:27:9: '/'
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:27:9: '/'
 			{
 			DebugLocation(27, 9);
 			Match('/'); 
@@ -312,30 +316,30 @@ private void mT__74()
 		}
 		finally
 		{
-			TraceOut("T__74", 5);
-			LeaveRule("T__74", 5);
-			LeaveRule_T__74();
+			TraceOut("T__78", 5);
+			LeaveRule("T__78", 5);
+			LeaveRule_T__78();
 		}
 	}
-	// $ANTLR end "T__74"
+	// $ANTLR end "T__78"
 
-	partial void EnterRule_T__75();
-	partial void LeaveRule_T__75();
+	partial void EnterRule_T__79();
+	partial void LeaveRule_T__79();
 
-	// $ANTLR start "T__75"
-	[GrammarRule("T__75")]
-	private void mT__75()
+	// $ANTLR start "T__79"
+	[GrammarRule("T__79")]
+	private void mT__79()
 	{
-		EnterRule_T__75();
-		EnterRule("T__75", 6);
-		TraceIn("T__75", 6);
+		EnterRule_T__79();
+		EnterRule("T__79", 6);
+		TraceIn("T__79", 6);
 		try
 		{
-			int _type = T__75;
+			int _type = T__79;
 			int _channel = DefaultTokenChannel;
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:28:7: ( ':' )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:28:7: ( ':' )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:28:9: ':'
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:28:9: ':'
 			{
 			DebugLocation(28, 9);
 			Match(':'); 
@@ -347,12 +351,12 @@ private void mT__75()
 		}
 		finally
 		{
-			TraceOut("T__75", 6);
-			LeaveRule("T__75", 6);
-			LeaveRule_T__75();
+			TraceOut("T__79", 6);
+			LeaveRule("T__79", 6);
+			LeaveRule_T__79();
 		}
 	}
-	// $ANTLR end "T__75"
+	// $ANTLR end "T__79"
 
 	partial void EnterRule_ASSIGN();
 	partial void LeaveRule_ASSIGN();
@@ -368,11 +372,11 @@ private void mASSIGN()
 		{
 			int _type = ASSIGN;
 			int _channel = DefaultTokenChannel;
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:125:2: ( '=' )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:149:2: ( '=' )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:125:5: '='
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:149:5: '='
 			{
-			DebugLocation(125, 5);
+			DebugLocation(149, 5);
 			Match('='); 
 
 			}
@@ -403,11 +407,11 @@ private void mEQUALS()
 		{
 			int _type = EQUALS;
 			int _channel = DefaultTokenChannel;
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:128:2: ( 'eq' )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:152:2: ( 'eq' )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:128:4: 'eq'
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:152:4: 'eq'
 			{
-			DebugLocation(128, 4);
+			DebugLocation(152, 4);
 			Match("eq"); 
 
 
@@ -439,11 +443,11 @@ private void mNOTEQUALS()
 		{
 			int _type = NOTEQUALS;
 			int _channel = DefaultTokenChannel;
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:131:2: ( 'ne' )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:155:2: ( 'ne' )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:131:4: 'ne'
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:155:4: 'ne'
 			{
-			DebugLocation(131, 4);
+			DebugLocation(155, 4);
 			Match("ne"); 
 
 
@@ -475,11 +479,11 @@ private void mGREATERTHAN()
 		{
 			int _type = GREATERTHAN;
 			int _channel = DefaultTokenChannel;
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:134:2: ( 'gt' )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:158:2: ( 'gt' )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:134:4: 'gt'
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:158:4: 'gt'
 			{
-			DebugLocation(134, 4);
+			DebugLocation(158, 4);
 			Match("gt"); 
 
 
@@ -511,11 +515,11 @@ private void mGREATERTHANOREQUAL()
 		{
 			int _type = GREATERTHANOREQUAL;
 			int _channel = DefaultTokenChannel;
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:137:2: ( 'ge' )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:161:2: ( 'ge' )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:137:4: 'ge'
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:161:4: 'ge'
 			{
-			DebugLocation(137, 4);
+			DebugLocation(161, 4);
 			Match("ge"); 
 
 
@@ -547,11 +551,11 @@ private void mLESSTHAN()
 		{
 			int _type = LESSTHAN;
 			int _channel = DefaultTokenChannel;
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:140:2: ( 'lt' )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:164:2: ( 'lt' )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:140:4: 'lt'
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:164:4: 'lt'
 			{
-			DebugLocation(140, 4);
+			DebugLocation(164, 4);
 			Match("lt"); 
 
 
@@ -583,11 +587,11 @@ private void mLESSTHANOREQUAL()
 		{
 			int _type = LESSTHANOREQUAL;
 			int _channel = DefaultTokenChannel;
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:143:2: ( 'le' )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:167:2: ( 'le' )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:143:4: 'le'
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:167:4: 'le'
 			{
-			DebugLocation(143, 4);
+			DebugLocation(167, 4);
 			Match("le"); 
 
 
@@ -619,11 +623,11 @@ private void mNOT()
 		{
 			int _type = NOT;
 			int _channel = DefaultTokenChannel;
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:146:2: ( 'not' )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:170:2: ( 'not' )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:146:4: 'not'
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:170:4: 'not'
 			{
-			DebugLocation(146, 4);
+			DebugLocation(170, 4);
 			Match("not"); 
 
 
@@ -655,11 +659,11 @@ private void mOR()
 		{
 			int _type = OR;
 			int _channel = DefaultTokenChannel;
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:149:2: ( 'or' )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:173:2: ( 'or' )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:149:4: 'or'
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:173:4: 'or'
 			{
-			DebugLocation(149, 4);
+			DebugLocation(173, 4);
 			Match("or"); 
 
 
@@ -691,11 +695,11 @@ private void mAND()
 		{
 			int _type = AND;
 			int _channel = DefaultTokenChannel;
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:152:2: ( 'and' )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:176:2: ( 'and' )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:152:5: 'and'
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:176:5: 'and'
 			{
-			DebugLocation(152, 5);
+			DebugLocation(176, 5);
 			Match("and"); 
 
 
@@ -727,11 +731,11 @@ private void mASC()
 		{
 			int _type = ASC;
 			int _channel = DefaultTokenChannel;
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:155:2: ( 'asc' )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:179:2: ( 'asc' )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:155:4: 'asc'
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:179:4: 'asc'
 			{
-			DebugLocation(155, 4);
+			DebugLocation(179, 4);
 			Match("asc"); 
 
 
@@ -763,11 +767,11 @@ private void mDESC()
 		{
 			int _type = DESC;
 			int _channel = DefaultTokenChannel;
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:158:2: ( 'desc' )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:182:2: ( 'desc' )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:158:4: 'desc'
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:182:4: 'desc'
 			{
-			DebugLocation(158, 4);
+			DebugLocation(182, 4);
 			Match("desc"); 
 
 
@@ -799,11 +803,11 @@ private void mALLPAGES()
 		{
 			int _type = ALLPAGES;
 			int _channel = DefaultTokenChannel;
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:161:2: ( 'allpages' )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:185:2: ( 'allpages' )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:161:5: 'allpages'
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:185:5: 'allpages'
 			{
-			DebugLocation(161, 5);
+			DebugLocation(185, 5);
 			Match("allpages"); 
 
 
@@ -835,11 +839,11 @@ private void mNONE()
 		{
 			int _type = NONE;
 			int _channel = DefaultTokenChannel;
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:164:2: ( 'none' )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:188:2: ( 'none' )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:164:4: 'none'
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:188:4: 'none'
 			{
-			DebugLocation(164, 4);
+			DebugLocation(188, 4);
 			Match("none"); 
 
 
@@ -871,11 +875,11 @@ private void mSKIP()
 		{
 			int _type = SKIP;
 			int _channel = DefaultTokenChannel;
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:167:2: ( '$skip=' )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:191:2: ( '$skip=' )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:167:4: '$skip='
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:191:4: '$skip='
 			{
-			DebugLocation(167, 4);
+			DebugLocation(191, 4);
 			Match("$skip="); 
 
 
@@ -907,11 +911,11 @@ private void mTOP()
 		{
 			int _type = TOP;
 			int _channel = DefaultTokenChannel;
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:170:2: ( '$top=' )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:194:2: ( '$top=' )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:170:4: '$top='
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:194:4: '$top='
 			{
-			DebugLocation(170, 4);
+			DebugLocation(194, 4);
 			Match("$top="); 
 
 
@@ -943,11 +947,11 @@ private void mFILTER()
 		{
 			int _type = FILTER;
 			int _channel = DefaultTokenChannel;
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:173:2: ( '$filter=' )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:197:2: ( '$filter=' )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:173:4: '$filter='
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:197:4: '$filter='
 			{
-			DebugLocation(173, 4);
+			DebugLocation(197, 4);
 			Match("$filter="); 
 
 
@@ -979,11 +983,11 @@ private void mORDERBY()
 		{
 			int _type = ORDERBY;
 			int _channel = DefaultTokenChannel;
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:176:2: ( '$orderby=' )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:200:2: ( '$orderby=' )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:176:4: '$orderby='
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:200:4: '$orderby='
 			{
-			DebugLocation(176, 4);
+			DebugLocation(200, 4);
 			Match("$orderby="); 
 
 
@@ -1015,11 +1019,11 @@ private void mSELECT()
 		{
 			int _type = SELECT;
 			int _channel = DefaultTokenChannel;
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:179:2: ( '$select=' )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:203:2: ( '$select=' )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:179:4: '$select='
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:203:4: '$select='
 			{
-			DebugLocation(179, 4);
+			DebugLocation(203, 4);
 			Match("$select="); 
 
 
@@ -1037,6 +1041,78 @@ private void mSELECT()
 	}
 	// $ANTLR end "SELECT"
 
+	partial void EnterRule_APPLY();
+	partial void LeaveRule_APPLY();
+
+	// $ANTLR start "APPLY"
+	[GrammarRule("APPLY")]
+	private void mAPPLY()
+	{
+		EnterRule_APPLY();
+		EnterRule("APPLY", 26);
+		TraceIn("APPLY", 26);
+		try
+		{
+			int _type = APPLY;
+			int _channel = DefaultTokenChannel;
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:206:2: ( '$apply=' )
+			DebugEnterAlt(1);
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:206:4: '$apply='
+			{
+			DebugLocation(206, 4);
+			Match("$apply="); 
+
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		}
+		finally
+		{
+			TraceOut("APPLY", 26);
+			LeaveRule("APPLY", 26);
+			LeaveRule_APPLY();
+		}
+	}
+	// $ANTLR end "APPLY"
+
+	partial void EnterRule_AGGREGATE();
+	partial void LeaveRule_AGGREGATE();
+
+	// $ANTLR start "AGGREGATE"
+	[GrammarRule("AGGREGATE")]
+	private void mAGGREGATE()
+	{
+		EnterRule_AGGREGATE();
+		EnterRule("AGGREGATE", 27);
+		TraceIn("AGGREGATE", 27);
+		try
+		{
+			int _type = AGGREGATE;
+			int _channel = DefaultTokenChannel;
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:209:2: ( 'aggregate' )
+			DebugEnterAlt(1);
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:209:4: 'aggregate'
+			{
+			DebugLocation(209, 4);
+			Match("aggregate"); 
+
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		}
+		finally
+		{
+			TraceOut("AGGREGATE", 27);
+			LeaveRule("AGGREGATE", 27);
+			LeaveRule_AGGREGATE();
+		}
+	}
+	// $ANTLR end "AGGREGATE"
+
 	partial void EnterRule_INLINECOUNT();
 	partial void LeaveRule_INLINECOUNT();
 
@@ -1045,17 +1121,17 @@ private void mSELECT()
 	private void mINLINECOUNT()
 	{
 		EnterRule_INLINECOUNT();
-		EnterRule("INLINECOUNT", 26);
-		TraceIn("INLINECOUNT", 26);
+		EnterRule("INLINECOUNT", 28);
+		TraceIn("INLINECOUNT", 28);
 		try
 		{
 			int _type = INLINECOUNT;
 			int _channel = DefaultTokenChannel;
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:182:2: ( '$inlinecount=' )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:212:2: ( '$inlinecount=' )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:182:4: '$inlinecount='
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:212:4: '$inlinecount='
 			{
-			DebugLocation(182, 4);
+			DebugLocation(212, 4);
 			Match("$inlinecount="); 
 
 
@@ -1066,8 +1142,8 @@ private void mINLINECOUNT()
 		}
 		finally
 		{
-			TraceOut("INLINECOUNT", 26);
-			LeaveRule("INLINECOUNT", 26);
+			TraceOut("INLINECOUNT", 28);
+			LeaveRule("INLINECOUNT", 28);
 			LeaveRule_INLINECOUNT();
 		}
 	}
@@ -1081,17 +1157,17 @@ private void mINLINECOUNT()
 	private void mEXPAND()
 	{
 		EnterRule_EXPAND();
-		EnterRule("EXPAND", 27);
-		TraceIn("EXPAND", 27);
+		EnterRule("EXPAND", 29);
+		TraceIn("EXPAND", 29);
 		try
 		{
 			int _type = EXPAND;
 			int _channel = DefaultTokenChannel;
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:184:8: ( '$expand=' )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:214:8: ( '$expand=' )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:184:10: '$expand='
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:214:10: '$expand='
 			{
-			DebugLocation(184, 10);
+			DebugLocation(214, 10);
 			Match("$expand="); 
 
 
@@ -1102,8 +1178,8 @@ private void mEXPAND()
 		}
 		finally
 		{
-			TraceOut("EXPAND", 27);
-			LeaveRule("EXPAND", 27);
+			TraceOut("EXPAND", 29);
+			LeaveRule("EXPAND", 29);
 			LeaveRule_EXPAND();
 		}
 	}
@@ -1117,21 +1193,21 @@ private void mEXPAND()
 	private void mIGNORED()
 	{
 		EnterRule_IGNORED();
-		EnterRule("IGNORED", 28);
-		TraceIn("IGNORED", 28);
+		EnterRule("IGNORED", 30);
+		TraceIn("IGNORED", 30);
 		try
 		{
 			int _type = IGNORED;
 			int _channel = DefaultTokenChannel;
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:186:9: ( '$' IDENTIFIER '=' )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:216:9: ( '$' IDENTIFIER '=' )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:186:11: '$' IDENTIFIER '='
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:216:11: '$' IDENTIFIER '='
 			{
-			DebugLocation(186, 11);
+			DebugLocation(216, 11);
 			Match('$'); 
-			DebugLocation(186, 15);
+			DebugLocation(216, 15);
 			mIDENTIFIER(); 
-			DebugLocation(186, 26);
+			DebugLocation(216, 26);
 			Match('='); 
 
 			}
@@ -1141,8 +1217,8 @@ private void mIGNORED()
 		}
 		finally
 		{
-			TraceOut("IGNORED", 28);
-			LeaveRule("IGNORED", 28);
+			TraceOut("IGNORED", 30);
+			LeaveRule("IGNORED", 30);
 			LeaveRule_IGNORED();
 		}
 	}
@@ -1156,17 +1232,17 @@ private void mIGNORED()
 	private void mSTARTSWITH()
 	{
 		EnterRule_STARTSWITH();
-		EnterRule("STARTSWITH", 29);
-		TraceIn("STARTSWITH", 29);
+		EnterRule("STARTSWITH", 31);
+		TraceIn("STARTSWITH", 31);
 		try
 		{
 			int _type = STARTSWITH;
 			int _channel = DefaultTokenChannel;
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:189:2: ( 'startswith' )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:219:2: ( 'startswith' )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:189:4: 'startswith'
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:219:4: 'startswith'
 			{
-			DebugLocation(189, 4);
+			DebugLocation(219, 4);
 			Match("startswith"); 
 
 
@@ -1177,8 +1253,8 @@ private void mSTARTSWITH()
 		}
 		finally
 		{
-			TraceOut("STARTSWITH", 29);
-			LeaveRule("STARTSWITH", 29);
+			TraceOut("STARTSWITH", 31);
+			LeaveRule("STARTSWITH", 31);
 			LeaveRule_STARTSWITH();
 		}
 	}
@@ -1192,17 +1268,17 @@ private void mSTARTSWITH()
 	private void mENDSWITH()
 	{
 		EnterRule_ENDSWITH();
-		EnterRule("ENDSWITH", 30);
-		TraceIn("ENDSWITH", 30);
+		EnterRule("ENDSWITH", 32);
+		TraceIn("ENDSWITH", 32);
 		try
 		{
 			int _type = ENDSWITH;
 			int _channel = DefaultTokenChannel;
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:192:2: ( 'endswith' )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:222:2: ( 'endswith' )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:192:4: 'endswith'
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:222:4: 'endswith'
 			{
-			DebugLocation(192, 4);
+			DebugLocation(222, 4);
 			Match("endswith"); 
 
 
@@ -1213,8 +1289,8 @@ private void mENDSWITH()
 		}
 		finally
 		{
-			TraceOut("ENDSWITH", 30);
-			LeaveRule("ENDSWITH", 30);
+			TraceOut("ENDSWITH", 32);
+			LeaveRule("ENDSWITH", 32);
 			LeaveRule_ENDSWITH();
 		}
 	}
@@ -1228,17 +1304,17 @@ private void mENDSWITH()
 	private void mSUBSTRINGOF()
 	{
 		EnterRule_SUBSTRINGOF();
-		EnterRule("SUBSTRINGOF", 31);
-		TraceIn("SUBSTRINGOF", 31);
+		EnterRule("SUBSTRINGOF", 33);
+		TraceIn("SUBSTRINGOF", 33);
 		try
 		{
 			int _type = SUBSTRINGOF;
 			int _channel = DefaultTokenChannel;
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:195:2: ( 'substringof' )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:225:2: ( 'substringof' )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:195:4: 'substringof'
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:225:4: 'substringof'
 			{
-			DebugLocation(195, 4);
+			DebugLocation(225, 4);
 			Match("substringof"); 
 
 
@@ -1249,8 +1325,8 @@ private void mSUBSTRINGOF()
 		}
 		finally
 		{
-			TraceOut("SUBSTRINGOF", 31);
-			LeaveRule("SUBSTRINGOF", 31);
+			TraceOut("SUBSTRINGOF", 33);
+			LeaveRule("SUBSTRINGOF", 33);
 			LeaveRule_SUBSTRINGOF();
 		}
 	}
@@ -1264,17 +1340,17 @@ private void mSUBSTRINGOF()
 	private void mTOLOWER()
 	{
 		EnterRule_TOLOWER();
-		EnterRule("TOLOWER", 32);
-		TraceIn("TOLOWER", 32);
+		EnterRule("TOLOWER", 34);
+		TraceIn("TOLOWER", 34);
 		try
 		{
 			int _type = TOLOWER;
 			int _channel = DefaultTokenChannel;
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:198:2: ( 'tolower' )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:228:2: ( 'tolower' )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:198:4: 'tolower'
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:228:4: 'tolower'
 			{
-			DebugLocation(198, 4);
+			DebugLocation(228, 4);
 			Match("tolower"); 
 
 
@@ -1285,8 +1361,8 @@ private void mTOLOWER()
 		}
 		finally
 		{
-			TraceOut("TOLOWER", 32);
-			LeaveRule("TOLOWER", 32);
+			TraceOut("TOLOWER", 34);
+			LeaveRule("TOLOWER", 34);
 			LeaveRule_TOLOWER();
 		}
 	}
@@ -1300,17 +1376,17 @@ private void mTOLOWER()
 	private void mTOUPPER()
 	{
 		EnterRule_TOUPPER();
-		EnterRule("TOUPPER", 33);
-		TraceIn("TOUPPER", 33);
+		EnterRule("TOUPPER", 35);
+		TraceIn("TOUPPER", 35);
 		try
 		{
 			int _type = TOUPPER;
 			int _channel = DefaultTokenChannel;
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:201:2: ( 'toupper' )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:231:2: ( 'toupper' )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:201:4: 'toupper'
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:231:4: 'toupper'
 			{
-			DebugLocation(201, 4);
+			DebugLocation(231, 4);
 			Match("toupper"); 
 
 
@@ -1321,8 +1397,8 @@ private void mTOUPPER()
 		}
 		finally
 		{
-			TraceOut("TOUPPER", 33);
-			LeaveRule("TOUPPER", 33);
+			TraceOut("TOUPPER", 35);
+			LeaveRule("TOUPPER", 35);
 			LeaveRule_TOUPPER();
 		}
 	}
@@ -1336,17 +1412,17 @@ private void mTOUPPER()
 	private void mYEAR()
 	{
 		EnterRule_YEAR();
-		EnterRule("YEAR", 34);
-		TraceIn("YEAR", 34);
+		EnterRule("YEAR", 36);
+		TraceIn("YEAR", 36);
 		try
 		{
 			int _type = YEAR;
 			int _channel = DefaultTokenChannel;
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:204:2: ( 'year' )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:234:2: ( 'year' )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:204:4: 'year'
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:234:4: 'year'
 			{
-			DebugLocation(204, 4);
+			DebugLocation(234, 4);
 			Match("year"); 
 
 
@@ -1357,8 +1433,8 @@ private void mYEAR()
 		}
 		finally
 		{
-			TraceOut("YEAR", 34);
-			LeaveRule("YEAR", 34);
+			TraceOut("YEAR", 36);
+			LeaveRule("YEAR", 36);
 			LeaveRule_YEAR();
 		}
 	}
@@ -1372,17 +1448,17 @@ private void mYEAR()
 	private void mYEARS()
 	{
 		EnterRule_YEARS();
-		EnterRule("YEARS", 35);
-		TraceIn("YEARS", 35);
+		EnterRule("YEARS", 37);
+		TraceIn("YEARS", 37);
 		try
 		{
 			int _type = YEARS;
 			int _channel = DefaultTokenChannel;
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:207:2: ( 'years' )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:237:2: ( 'years' )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:207:4: 'years'
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:237:4: 'years'
 			{
-			DebugLocation(207, 4);
+			DebugLocation(237, 4);
 			Match("years"); 
 
 
@@ -1393,8 +1469,8 @@ private void mYEARS()
 		}
 		finally
 		{
-			TraceOut("YEARS", 35);
-			LeaveRule("YEARS", 35);
+			TraceOut("YEARS", 37);
+			LeaveRule("YEARS", 37);
 			LeaveRule_YEARS();
 		}
 	}
@@ -1408,17 +1484,17 @@ private void mYEARS()
 	private void mMONTH()
 	{
 		EnterRule_MONTH();
-		EnterRule("MONTH", 36);
-		TraceIn("MONTH", 36);
+		EnterRule("MONTH", 38);
+		TraceIn("MONTH", 38);
 		try
 		{
 			int _type = MONTH;
 			int _channel = DefaultTokenChannel;
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:210:2: ( 'month' )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:240:2: ( 'month' )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:210:4: 'month'
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:240:4: 'month'
 			{
-			DebugLocation(210, 4);
+			DebugLocation(240, 4);
 			Match("month"); 
 
 
@@ -1429,8 +1505,8 @@ private void mMONTH()
 		}
 		finally
 		{
-			TraceOut("MONTH", 36);
-			LeaveRule("MONTH", 36);
+			TraceOut("MONTH", 38);
+			LeaveRule("MONTH", 38);
 			LeaveRule_MONTH();
 		}
 	}
@@ -1444,17 +1520,17 @@ private void mMONTH()
 	private void mDAY()
 	{
 		EnterRule_DAY();
-		EnterRule("DAY", 37);
-		TraceIn("DAY", 37);
+		EnterRule("DAY", 39);
+		TraceIn("DAY", 39);
 		try
 		{
 			int _type = DAY;
 			int _channel = DefaultTokenChannel;
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:213:2: ( 'day' )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:243:2: ( 'day' )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:213:4: 'day'
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:243:4: 'day'
 			{
-			DebugLocation(213, 4);
+			DebugLocation(243, 4);
 			Match("day"); 
 
 
@@ -1465,8 +1541,8 @@ private void mDAY()
 		}
 		finally
 		{
-			TraceOut("DAY", 37);
-			LeaveRule("DAY", 37);
+			TraceOut("DAY", 39);
+			LeaveRule("DAY", 39);
 			LeaveRule_DAY();
 		}
 	}
@@ -1480,17 +1556,17 @@ private void mDAY()
 	private void mDAYS()
 	{
 		EnterRule_DAYS();
-		EnterRule("DAYS", 38);
-		TraceIn("DAYS", 38);
+		EnterRule("DAYS", 40);
+		TraceIn("DAYS", 40);
 		try
 		{
 			int _type = DAYS;
 			int _channel = DefaultTokenChannel;
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:216:2: ( 'days' )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:246:2: ( 'days' )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:216:4: 'days'
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:246:4: 'days'
 			{
-			DebugLocation(216, 4);
+			DebugLocation(246, 4);
 			Match("days"); 
 
 
@@ -1501,8 +1577,8 @@ private void mDAYS()
 		}
 		finally
 		{
-			TraceOut("DAYS", 38);
-			LeaveRule("DAYS", 38);
+			TraceOut("DAYS", 40);
+			LeaveRule("DAYS", 40);
 			LeaveRule_DAYS();
 		}
 	}
@@ -1516,17 +1592,17 @@ private void mDAYS()
 	private void mHOUR()
 	{
 		EnterRule_HOUR();
-		EnterRule("HOUR", 39);
-		TraceIn("HOUR", 39);
+		EnterRule("HOUR", 41);
+		TraceIn("HOUR", 41);
 		try
 		{
 			int _type = HOUR;
 			int _channel = DefaultTokenChannel;
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:219:2: ( 'hour' )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:249:2: ( 'hour' )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:219:4: 'hour'
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:249:4: 'hour'
 			{
-			DebugLocation(219, 4);
+			DebugLocation(249, 4);
 			Match("hour"); 
 
 
@@ -1537,8 +1613,8 @@ private void mHOUR()
 		}
 		finally
 		{
-			TraceOut("HOUR", 39);
-			LeaveRule("HOUR", 39);
+			TraceOut("HOUR", 41);
+			LeaveRule("HOUR", 41);
 			LeaveRule_HOUR();
 		}
 	}
@@ -1552,17 +1628,17 @@ private void mHOUR()
 	private void mHOURS()
 	{
 		EnterRule_HOURS();
-		EnterRule("HOURS", 40);
-		TraceIn("HOURS", 40);
+		EnterRule("HOURS", 42);
+		TraceIn("HOURS", 42);
 		try
 		{
 			int _type = HOURS;
 			int _channel = DefaultTokenChannel;
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:222:2: ( 'hours' )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:252:2: ( 'hours' )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:222:4: 'hours'
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:252:4: 'hours'
 			{
-			DebugLocation(222, 4);
+			DebugLocation(252, 4);
 			Match("hours"); 
 
 
@@ -1573,8 +1649,8 @@ private void mHOURS()
 		}
 		finally
 		{
-			TraceOut("HOURS", 40);
-			LeaveRule("HOURS", 40);
+			TraceOut("HOURS", 42);
+			LeaveRule("HOURS", 42);
 			LeaveRule_HOURS();
 		}
 	}
@@ -1588,17 +1664,17 @@ private void mHOURS()
 	private void mMINUTE()
 	{
 		EnterRule_MINUTE();
-		EnterRule("MINUTE", 41);
-		TraceIn("MINUTE", 41);
+		EnterRule("MINUTE", 43);
+		TraceIn("MINUTE", 43);
 		try
 		{
 			int _type = MINUTE;
 			int _channel = DefaultTokenChannel;
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:225:2: ( 'minute' )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:255:2: ( 'minute' )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:225:4: 'minute'
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:255:4: 'minute'
 			{
-			DebugLocation(225, 4);
+			DebugLocation(255, 4);
 			Match("minute"); 
 
 
@@ -1609,8 +1685,8 @@ private void mMINUTE()
 		}
 		finally
 		{
-			TraceOut("MINUTE", 41);
-			LeaveRule("MINUTE", 41);
+			TraceOut("MINUTE", 43);
+			LeaveRule("MINUTE", 43);
 			LeaveRule_MINUTE();
 		}
 	}
@@ -1624,17 +1700,17 @@ private void mMINUTE()
 	private void mMINUTES()
 	{
 		EnterRule_MINUTES();
-		EnterRule("MINUTES", 42);
-		TraceIn("MINUTES", 42);
+		EnterRule("MINUTES", 44);
+		TraceIn("MINUTES", 44);
 		try
 		{
 			int _type = MINUTES;
 			int _channel = DefaultTokenChannel;
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:228:2: ( 'minutes' )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:258:2: ( 'minutes' )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:228:4: 'minutes'
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:258:4: 'minutes'
 			{
-			DebugLocation(228, 4);
+			DebugLocation(258, 4);
 			Match("minutes"); 
 
 
@@ -1645,8 +1721,8 @@ private void mMINUTES()
 		}
 		finally
 		{
-			TraceOut("MINUTES", 42);
-			LeaveRule("MINUTES", 42);
+			TraceOut("MINUTES", 44);
+			LeaveRule("MINUTES", 44);
 			LeaveRule_MINUTES();
 		}
 	}
@@ -1660,17 +1736,17 @@ private void mMINUTES()
 	private void mSECOND()
 	{
 		EnterRule_SECOND();
-		EnterRule("SECOND", 43);
-		TraceIn("SECOND", 43);
+		EnterRule("SECOND", 45);
+		TraceIn("SECOND", 45);
 		try
 		{
 			int _type = SECOND;
 			int _channel = DefaultTokenChannel;
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:231:2: ( 'second' )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:261:2: ( 'second' )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:231:4: 'second'
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:261:4: 'second'
 			{
-			DebugLocation(231, 4);
+			DebugLocation(261, 4);
 			Match("second"); 
 
 
@@ -1681,8 +1757,8 @@ private void mSECOND()
 		}
 		finally
 		{
-			TraceOut("SECOND", 43);
-			LeaveRule("SECOND", 43);
+			TraceOut("SECOND", 45);
+			LeaveRule("SECOND", 45);
 			LeaveRule_SECOND();
 		}
 	}
@@ -1696,17 +1772,17 @@ private void mSECOND()
 	private void mSECONDS()
 	{
 		EnterRule_SECONDS();
-		EnterRule("SECONDS", 44);
-		TraceIn("SECONDS", 44);
+		EnterRule("SECONDS", 46);
+		TraceIn("SECONDS", 46);
 		try
 		{
 			int _type = SECONDS;
 			int _channel = DefaultTokenChannel;
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:234:2: ( 'seconds' )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:264:2: ( 'seconds' )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:234:4: 'seconds'
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:264:4: 'seconds'
 			{
-			DebugLocation(234, 4);
+			DebugLocation(264, 4);
 			Match("seconds"); 
 
 
@@ -1717,8 +1793,8 @@ private void mSECONDS()
 		}
 		finally
 		{
-			TraceOut("SECONDS", 44);
-			LeaveRule("SECONDS", 44);
+			TraceOut("SECONDS", 46);
+			LeaveRule("SECONDS", 46);
 			LeaveRule_SECONDS();
 		}
 	}
@@ -1732,17 +1808,17 @@ private void mSECONDS()
 	private void mANY()
 	{
 		EnterRule_ANY();
-		EnterRule("ANY", 45);
-		TraceIn("ANY", 45);
+		EnterRule("ANY", 47);
+		TraceIn("ANY", 47);
 		try
 		{
 			int _type = ANY;
 			int _channel = DefaultTokenChannel;
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:236:5: ( 'any' )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:266:5: ( 'any' )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:236:8: 'any'
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:266:8: 'any'
 			{
-			DebugLocation(236, 8);
+			DebugLocation(266, 8);
 			Match("any"); 
 
 
@@ -1753,8 +1829,8 @@ private void mANY()
 		}
 		finally
 		{
-			TraceOut("ANY", 45);
-			LeaveRule("ANY", 45);
+			TraceOut("ANY", 47);
+			LeaveRule("ANY", 47);
 			LeaveRule_ANY();
 		}
 	}
@@ -1768,17 +1844,17 @@ private void mANY()
 	private void mALL()
 	{
 		EnterRule_ALL();
-		EnterRule("ALL", 46);
-		TraceIn("ALL", 46);
+		EnterRule("ALL", 48);
+		TraceIn("ALL", 48);
 		try
 		{
 			int _type = ALL;
 			int _channel = DefaultTokenChannel;
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:238:5: ( 'all' )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:268:5: ( 'all' )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:238:7: 'all'
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:268:7: 'all'
 			{
-			DebugLocation(238, 7);
+			DebugLocation(268, 7);
 			Match("all"); 
 
 
@@ -1789,8 +1865,8 @@ private void mALL()
 		}
 		finally
 		{
-			TraceOut("ALL", 46);
-			LeaveRule("ALL", 46);
+			TraceOut("ALL", 48);
+			LeaveRule("ALL", 48);
 			LeaveRule_ALL();
 		}
 	}
@@ -1804,17 +1880,17 @@ private void mALL()
 	private void mCOUNT()
 	{
 		EnterRule_COUNT();
-		EnterRule("COUNT", 47);
-		TraceIn("COUNT", 47);
+		EnterRule("COUNT", 49);
+		TraceIn("COUNT", 49);
 		try
 		{
 			int _type = COUNT;
 			int _channel = DefaultTokenChannel;
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:240:7: ( 'count' )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:270:7: ( 'count' )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:240:9: 'count'
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:270:9: 'count'
 			{
-			DebugLocation(240, 9);
+			DebugLocation(270, 9);
 			Match("count"); 
 
 
@@ -1825,8 +1901,8 @@ private void mCOUNT()
 		}
 		finally
 		{
-			TraceOut("COUNT", 47);
-			LeaveRule("COUNT", 47);
+			TraceOut("COUNT", 49);
+			LeaveRule("COUNT", 49);
 			LeaveRule_COUNT();
 		}
 	}
@@ -1840,17 +1916,17 @@ private void mCOUNT()
 	private void mMIN()
 	{
 		EnterRule_MIN();
-		EnterRule("MIN", 48);
-		TraceIn("MIN", 48);
+		EnterRule("MIN", 50);
+		TraceIn("MIN", 50);
 		try
 		{
 			int _type = MIN;
 			int _channel = DefaultTokenChannel;
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:242:5: ( 'min' )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:272:5: ( 'min' )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:242:7: 'min'
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:272:7: 'min'
 			{
-			DebugLocation(242, 7);
+			DebugLocation(272, 7);
 			Match("min"); 
 
 
@@ -1861,8 +1937,8 @@ private void mMIN()
 		}
 		finally
 		{
-			TraceOut("MIN", 48);
-			LeaveRule("MIN", 48);
+			TraceOut("MIN", 50);
+			LeaveRule("MIN", 50);
 			LeaveRule_MIN();
 		}
 	}
@@ -1876,17 +1952,17 @@ private void mMIN()
 	private void mMAX()
 	{
 		EnterRule_MAX();
-		EnterRule("MAX", 49);
-		TraceIn("MAX", 49);
+		EnterRule("MAX", 51);
+		TraceIn("MAX", 51);
 		try
 		{
 			int _type = MAX;
 			int _channel = DefaultTokenChannel;
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:244:5: ( 'max' )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:274:5: ( 'max' )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:244:7: 'max'
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:274:7: 'max'
 			{
-			DebugLocation(244, 7);
+			DebugLocation(274, 7);
 			Match("max"); 
 
 
@@ -1897,8 +1973,8 @@ private void mMAX()
 		}
 		finally
 		{
-			TraceOut("MAX", 49);
-			LeaveRule("MAX", 49);
+			TraceOut("MAX", 51);
+			LeaveRule("MAX", 51);
 			LeaveRule_MAX();
 		}
 	}
@@ -1912,17 +1988,17 @@ private void mMAX()
 	private void mSUM()
 	{
 		EnterRule_SUM();
-		EnterRule("SUM", 50);
-		TraceIn("SUM", 50);
+		EnterRule("SUM", 52);
+		TraceIn("SUM", 52);
 		try
 		{
 			int _type = SUM;
 			int _channel = DefaultTokenChannel;
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:246:5: ( 'sum' )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:276:5: ( 'sum' )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:246:7: 'sum'
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:276:7: 'sum'
 			{
-			DebugLocation(246, 7);
+			DebugLocation(276, 7);
 			Match("sum"); 
 
 
@@ -1933,8 +2009,8 @@ private void mSUM()
 		}
 		finally
 		{
-			TraceOut("SUM", 50);
-			LeaveRule("SUM", 50);
+			TraceOut("SUM", 52);
+			LeaveRule("SUM", 52);
 			LeaveRule_SUM();
 		}
 	}
@@ -1948,17 +2024,17 @@ private void mSUM()
 	private void mAVERAGE()
 	{
 		EnterRule_AVERAGE();
-		EnterRule("AVERAGE", 51);
-		TraceIn("AVERAGE", 51);
+		EnterRule("AVERAGE", 53);
+		TraceIn("AVERAGE", 53);
 		try
 		{
 			int _type = AVERAGE;
 			int _channel = DefaultTokenChannel;
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:248:9: ( 'average' )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:278:9: ( 'average' )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:248:11: 'average'
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:278:11: 'average'
 			{
-			DebugLocation(248, 11);
+			DebugLocation(278, 11);
 			Match("average"); 
 
 
@@ -1969,13 +2045,85 @@ private void mAVERAGE()
 		}
 		finally
 		{
-			TraceOut("AVERAGE", 51);
-			LeaveRule("AVERAGE", 51);
+			TraceOut("AVERAGE", 53);
+			LeaveRule("AVERAGE", 53);
 			LeaveRule_AVERAGE();
 		}
 	}
 	// $ANTLR end "AVERAGE"
 
+	partial void EnterRule_AS();
+	partial void LeaveRule_AS();
+
+	// $ANTLR start "AS"
+	[GrammarRule("AS")]
+	private void mAS()
+	{
+		EnterRule_AS();
+		EnterRule("AS", 54);
+		TraceIn("AS", 54);
+		try
+		{
+			int _type = AS;
+			int _channel = DefaultTokenChannel;
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:280:3: ( 'as' )
+			DebugEnterAlt(1);
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:280:5: 'as'
+			{
+			DebugLocation(280, 5);
+			Match("as"); 
+
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		}
+		finally
+		{
+			TraceOut("AS", 54);
+			LeaveRule("AS", 54);
+			LeaveRule_AS();
+		}
+	}
+	// $ANTLR end "AS"
+
+	partial void EnterRule_WITH();
+	partial void LeaveRule_WITH();
+
+	// $ANTLR start "WITH"
+	[GrammarRule("WITH")]
+	private void mWITH()
+	{
+		EnterRule_WITH();
+		EnterRule("WITH", 55);
+		TraceIn("WITH", 55);
+		try
+		{
+			int _type = WITH;
+			int _channel = DefaultTokenChannel;
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:282:5: ( 'with' )
+			DebugEnterAlt(1);
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:282:7: 'with'
+			{
+			DebugLocation(282, 7);
+			Match("with"); 
+
+
+			}
+
+			state.type = _type;
+			state.channel = _channel;
+		}
+		finally
+		{
+			TraceOut("WITH", 55);
+			LeaveRule("WITH", 55);
+			LeaveRule_WITH();
+		}
+	}
+	// $ANTLR end "WITH"
+
 	partial void EnterRule_INT();
 	partial void LeaveRule_INT();
 
@@ -1984,18 +2132,18 @@ private void mAVERAGE()
 	private void mINT()
 	{
 		EnterRule_INT();
-		EnterRule("INT", 52);
-		TraceIn("INT", 52);
+		EnterRule("INT", 56);
+		TraceIn("INT", 56);
 		try
 		{
 			int _type = INT;
 			int _channel = DefaultTokenChannel;
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:250:5: ( ( '-' )? ( '0' .. '9' )+ )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:284:5: ( ( '-' )? ( '0' .. '9' )+ )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:250:7: ( '-' )? ( '0' .. '9' )+
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:284:7: ( '-' )? ( '0' .. '9' )+
 			{
-			DebugLocation(250, 7);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:250:7: ( '-' )?
+			DebugLocation(284, 7);
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:284:7: ( '-' )?
 			int alt1=2;
 			try { DebugEnterSubRule(1);
 			try { DebugEnterDecision(1, false);
@@ -2010,9 +2158,9 @@ private void mINT()
 			{
 			case 1:
 				DebugEnterAlt(1);
-				// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:250:8: '-'
+				// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:284:8: '-'
 				{
-				DebugLocation(250, 8);
+				DebugLocation(284, 8);
 				Match('-'); 
 
 				}
@@ -2021,8 +2169,8 @@ private void mINT()
 			}
 			} finally { DebugExitSubRule(1); }
 
-			DebugLocation(250, 17);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:250:17: ( '0' .. '9' )+
+			DebugLocation(284, 17);
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:284:17: ( '0' .. '9' )+
 			int cnt2=0;
 			try { DebugEnterSubRule(2);
 			while (true)
@@ -2042,9 +2190,9 @@ private void mINT()
 				{
 				case 1:
 					DebugEnterAlt(1);
-					// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:
+					// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:
 					{
-					DebugLocation(250, 17);
+					DebugLocation(284, 17);
 					input.Consume();
 
 
@@ -2074,8 +2222,8 @@ private void mINT()
 		}
 		finally
 		{
-			TraceOut("INT", 52);
-			LeaveRule("INT", 52);
+			TraceOut("INT", 56);
+			LeaveRule("INT", 56);
 			LeaveRule_INT();
 		}
 	}
@@ -2089,18 +2237,18 @@ private void mINT()
 	private void mLONG()
 	{
 		EnterRule_LONG();
-		EnterRule("LONG", 53);
-		TraceIn("LONG", 53);
+		EnterRule("LONG", 57);
+		TraceIn("LONG", 57);
 		try
 		{
 			int _type = LONG;
 			int _channel = DefaultTokenChannel;
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:252:6: ( ( '-' )? ( '0' .. '9' )+ 'L' )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:286:6: ( ( '-' )? ( '0' .. '9' )+ 'L' )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:252:8: ( '-' )? ( '0' .. '9' )+ 'L'
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:286:8: ( '-' )? ( '0' .. '9' )+ 'L'
 			{
-			DebugLocation(252, 8);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:252:8: ( '-' )?
+			DebugLocation(286, 8);
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:286:8: ( '-' )?
 			int alt3=2;
 			try { DebugEnterSubRule(3);
 			try { DebugEnterDecision(3, false);
@@ -2115,9 +2263,9 @@ private void mLONG()
 			{
 			case 1:
 				DebugEnterAlt(1);
-				// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:252:9: '-'
+				// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:286:9: '-'
 				{
-				DebugLocation(252, 9);
+				DebugLocation(286, 9);
 				Match('-'); 
 
 				}
@@ -2126,8 +2274,8 @@ private void mLONG()
 			}
 			} finally { DebugExitSubRule(3); }
 
-			DebugLocation(252, 15);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:252:15: ( '0' .. '9' )+
+			DebugLocation(286, 15);
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:286:15: ( '0' .. '9' )+
 			int cnt4=0;
 			try { DebugEnterSubRule(4);
 			while (true)
@@ -2147,9 +2295,9 @@ private void mLONG()
 				{
 				case 1:
 					DebugEnterAlt(1);
-					// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:
+					// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:
 					{
-					DebugLocation(252, 15);
+					DebugLocation(286, 15);
 					input.Consume();
 
 
@@ -2171,7 +2319,7 @@ private void mLONG()
 
 			} finally { DebugExitSubRule(4); }
 
-			DebugLocation(252, 27);
+			DebugLocation(286, 27);
 			Match('L'); 
 
 			}
@@ -2181,8 +2329,8 @@ private void mLONG()
 		}
 		finally
 		{
-			TraceOut("LONG", 53);
-			LeaveRule("LONG", 53);
+			TraceOut("LONG", 57);
+			LeaveRule("LONG", 57);
 			LeaveRule_LONG();
 		}
 	}
@@ -2196,18 +2344,18 @@ private void mLONG()
 	private void mDOUBLE()
 	{
 		EnterRule_DOUBLE();
-		EnterRule("DOUBLE", 54);
-		TraceIn("DOUBLE", 54);
+		EnterRule("DOUBLE", 58);
+		TraceIn("DOUBLE", 58);
 		try
 		{
 			int _type = DOUBLE;
 			int _channel = DefaultTokenChannel;
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:254:8: ( ( '-' )? ( '0' .. '9' )+ '.' ( '0' .. '9' )+ ( 'd' )? )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:288:8: ( ( '-' )? ( '0' .. '9' )+ '.' ( '0' .. '9' )+ ( 'd' )? )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:254:10: ( '-' )? ( '0' .. '9' )+ '.' ( '0' .. '9' )+ ( 'd' )?
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:288:10: ( '-' )? ( '0' .. '9' )+ '.' ( '0' .. '9' )+ ( 'd' )?
 			{
-			DebugLocation(254, 10);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:254:10: ( '-' )?
+			DebugLocation(288, 10);
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:288:10: ( '-' )?
 			int alt5=2;
 			try { DebugEnterSubRule(5);
 			try { DebugEnterDecision(5, false);
@@ -2222,9 +2370,9 @@ private void mDOUBLE()
 			{
 			case 1:
 				DebugEnterAlt(1);
-				// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:254:11: '-'
+				// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:288:11: '-'
 				{
-				DebugLocation(254, 11);
+				DebugLocation(288, 11);
 				Match('-'); 
 
 				}
@@ -2233,8 +2381,8 @@ private void mDOUBLE()
 			}
 			} finally { DebugExitSubRule(5); }
 
-			DebugLocation(254, 17);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:254:17: ( '0' .. '9' )+
+			DebugLocation(288, 17);
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:288:17: ( '0' .. '9' )+
 			int cnt6=0;
 			try { DebugEnterSubRule(6);
 			while (true)
@@ -2254,9 +2402,9 @@ private void mDOUBLE()
 				{
 				case 1:
 					DebugEnterAlt(1);
-					// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:
+					// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:
 					{
-					DebugLocation(254, 17);
+					DebugLocation(288, 17);
 					input.Consume();
 
 
@@ -2278,10 +2426,10 @@ private void mDOUBLE()
 
 			} finally { DebugExitSubRule(6); }
 
-			DebugLocation(254, 29);
+			DebugLocation(288, 29);
 			Match('.'); 
-			DebugLocation(254, 33);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:254:33: ( '0' .. '9' )+
+			DebugLocation(288, 33);
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:288:33: ( '0' .. '9' )+
 			int cnt7=0;
 			try { DebugEnterSubRule(7);
 			while (true)
@@ -2301,9 +2449,9 @@ private void mDOUBLE()
 				{
 				case 1:
 					DebugEnterAlt(1);
-					// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:
+					// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:
 					{
-					DebugLocation(254, 33);
+					DebugLocation(288, 33);
 					input.Consume();
 
 
@@ -2325,8 +2473,8 @@ private void mDOUBLE()
 
 			} finally { DebugExitSubRule(7); }
 
-			DebugLocation(254, 45);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:254:45: ( 'd' )?
+			DebugLocation(288, 45);
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:288:45: ( 'd' )?
 			int alt8=2;
 			try { DebugEnterSubRule(8);
 			try { DebugEnterDecision(8, false);
@@ -2341,9 +2489,9 @@ private void mDOUBLE()
 			{
 			case 1:
 				DebugEnterAlt(1);
-				// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:254:45: 'd'
+				// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:288:45: 'd'
 				{
-				DebugLocation(254, 45);
+				DebugLocation(288, 45);
 				Match('d'); 
 
 				}
@@ -2360,8 +2508,8 @@ private void mDOUBLE()
 		}
 		finally
 		{
-			TraceOut("DOUBLE", 54);
-			LeaveRule("DOUBLE", 54);
+			TraceOut("DOUBLE", 58);
+			LeaveRule("DOUBLE", 58);
 			LeaveRule_DOUBLE();
 		}
 	}
@@ -2375,18 +2523,18 @@ private void mDOUBLE()
 	private void mSINGLE()
 	{
 		EnterRule_SINGLE();
-		EnterRule("SINGLE", 55);
-		TraceIn("SINGLE", 55);
+		EnterRule("SINGLE", 59);
+		TraceIn("SINGLE", 59);
 		try
 		{
 			int _type = SINGLE;
 			int _channel = DefaultTokenChannel;
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:256:8: ( ( '-' )? ( '0' .. '9' )+ '.' ( '0' .. '9' )+ 'f' )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:290:8: ( ( '-' )? ( '0' .. '9' )+ '.' ( '0' .. '9' )+ 'f' )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:256:10: ( '-' )? ( '0' .. '9' )+ '.' ( '0' .. '9' )+ 'f'
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:290:10: ( '-' )? ( '0' .. '9' )+ '.' ( '0' .. '9' )+ 'f'
 			{
-			DebugLocation(256, 10);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:256:10: ( '-' )?
+			DebugLocation(290, 10);
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:290:10: ( '-' )?
 			int alt9=2;
 			try { DebugEnterSubRule(9);
 			try { DebugEnterDecision(9, false);
@@ -2401,9 +2549,9 @@ private void mSINGLE()
 			{
 			case 1:
 				DebugEnterAlt(1);
-				// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:256:11: '-'
+				// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:290:11: '-'
 				{
-				DebugLocation(256, 11);
+				DebugLocation(290, 11);
 				Match('-'); 
 
 				}
@@ -2412,8 +2560,8 @@ private void mSINGLE()
 			}
 			} finally { DebugExitSubRule(9); }
 
-			DebugLocation(256, 17);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:256:17: ( '0' .. '9' )+
+			DebugLocation(290, 17);
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:290:17: ( '0' .. '9' )+
 			int cnt10=0;
 			try { DebugEnterSubRule(10);
 			while (true)
@@ -2433,9 +2581,9 @@ private void mSINGLE()
 				{
 				case 1:
 					DebugEnterAlt(1);
-					// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:
+					// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:
 					{
-					DebugLocation(256, 17);
+					DebugLocation(290, 17);
 					input.Consume();
 
 
@@ -2457,10 +2605,10 @@ private void mSINGLE()
 
 			} finally { DebugExitSubRule(10); }
 
-			DebugLocation(256, 29);
+			DebugLocation(290, 29);
 			Match('.'); 
-			DebugLocation(256, 33);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:256:33: ( '0' .. '9' )+
+			DebugLocation(290, 33);
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:290:33: ( '0' .. '9' )+
 			int cnt11=0;
 			try { DebugEnterSubRule(11);
 			while (true)
@@ -2480,9 +2628,9 @@ private void mSINGLE()
 				{
 				case 1:
 					DebugEnterAlt(1);
-					// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:
+					// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:
 					{
-					DebugLocation(256, 33);
+					DebugLocation(290, 33);
 					input.Consume();
 
 
@@ -2504,7 +2652,7 @@ private void mSINGLE()
 
 			} finally { DebugExitSubRule(11); }
 
-			DebugLocation(256, 45);
+			DebugLocation(290, 45);
 			Match('f'); 
 
 			}
@@ -2514,8 +2662,8 @@ private void mSINGLE()
 		}
 		finally
 		{
-			TraceOut("SINGLE", 55);
-			LeaveRule("SINGLE", 55);
+			TraceOut("SINGLE", 59);
+			LeaveRule("SINGLE", 59);
 			LeaveRule_SINGLE();
 		}
 	}
@@ -2529,18 +2677,18 @@ private void mSINGLE()
 	private void mDECIMAL()
 	{
 		EnterRule_DECIMAL();
-		EnterRule("DECIMAL", 56);
-		TraceIn("DECIMAL", 56);
+		EnterRule("DECIMAL", 60);
+		TraceIn("DECIMAL", 60);
 		try
 		{
 			int _type = DECIMAL;
 			int _channel = DefaultTokenChannel;
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:258:9: ( ( '-' )? ( '0' .. '9' )+ '.' ( '0' .. '9' )+ 'm' )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:292:9: ( ( '-' )? ( '0' .. '9' )+ '.' ( '0' .. '9' )+ 'm' )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:258:11: ( '-' )? ( '0' .. '9' )+ '.' ( '0' .. '9' )+ 'm'
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:292:11: ( '-' )? ( '0' .. '9' )+ '.' ( '0' .. '9' )+ 'm'
 			{
-			DebugLocation(258, 11);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:258:11: ( '-' )?
+			DebugLocation(292, 11);
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:292:11: ( '-' )?
 			int alt12=2;
 			try { DebugEnterSubRule(12);
 			try { DebugEnterDecision(12, false);
@@ -2555,9 +2703,9 @@ private void mDECIMAL()
 			{
 			case 1:
 				DebugEnterAlt(1);
-				// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:258:12: '-'
+				// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:292:12: '-'
 				{
-				DebugLocation(258, 12);
+				DebugLocation(292, 12);
 				Match('-'); 
 
 				}
@@ -2566,8 +2714,8 @@ private void mDECIMAL()
 			}
 			} finally { DebugExitSubRule(12); }
 
-			DebugLocation(258, 18);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:258:18: ( '0' .. '9' )+
+			DebugLocation(292, 18);
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:292:18: ( '0' .. '9' )+
 			int cnt13=0;
 			try { DebugEnterSubRule(13);
 			while (true)
@@ -2587,9 +2735,9 @@ private void mDECIMAL()
 				{
 				case 1:
 					DebugEnterAlt(1);
-					// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:
+					// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:
 					{
-					DebugLocation(258, 18);
+					DebugLocation(292, 18);
 					input.Consume();
 
 
@@ -2611,10 +2759,10 @@ private void mDECIMAL()
 
 			} finally { DebugExitSubRule(13); }
 
-			DebugLocation(258, 30);
+			DebugLocation(292, 30);
 			Match('.'); 
-			DebugLocation(258, 34);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:258:34: ( '0' .. '9' )+
+			DebugLocation(292, 34);
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:292:34: ( '0' .. '9' )+
 			int cnt14=0;
 			try { DebugEnterSubRule(14);
 			while (true)
@@ -2634,9 +2782,9 @@ private void mDECIMAL()
 				{
 				case 1:
 					DebugEnterAlt(1);
-					// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:
+					// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:
 					{
-					DebugLocation(258, 34);
+					DebugLocation(292, 34);
 					input.Consume();
 
 
@@ -2658,7 +2806,7 @@ private void mDECIMAL()
 
 			} finally { DebugExitSubRule(14); }
 
-			DebugLocation(258, 46);
+			DebugLocation(292, 46);
 			Match('m'); 
 
 			}
@@ -2668,8 +2816,8 @@ private void mDECIMAL()
 		}
 		finally
 		{
-			TraceOut("DECIMAL", 56);
-			LeaveRule("DECIMAL", 56);
+			TraceOut("DECIMAL", 60);
+			LeaveRule("DECIMAL", 60);
 			LeaveRule_DECIMAL();
 		}
 	}
@@ -2683,18 +2831,18 @@ private void mDECIMAL()
 	private void mBOOL()
 	{
 		EnterRule_BOOL();
-		EnterRule("BOOL", 57);
-		TraceIn("BOOL", 57);
+		EnterRule("BOOL", 61);
+		TraceIn("BOOL", 61);
 		try
 		{
 			int _type = BOOL;
 			int _channel = DefaultTokenChannel;
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:260:6: ( ( 'true' | 'false' ) )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:294:6: ( ( 'true' | 'false' ) )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:260:8: ( 'true' | 'false' )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:294:8: ( 'true' | 'false' )
 			{
-			DebugLocation(260, 8);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:260:8: ( 'true' | 'false' )
+			DebugLocation(294, 8);
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:294:8: ( 'true' | 'false' )
 			int alt15=2;
 			try { DebugEnterSubRule(15);
 			try { DebugEnterDecision(15, false);
@@ -2719,9 +2867,9 @@ private void mBOOL()
 			{
 			case 1:
 				DebugEnterAlt(1);
-				// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:260:9: 'true'
+				// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:294:9: 'true'
 				{
-				DebugLocation(260, 9);
+				DebugLocation(294, 9);
 				Match("true"); 
 
 
@@ -2729,9 +2877,9 @@ private void mBOOL()
 				break;
 			case 2:
 				DebugEnterAlt(2);
-				// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:260:18: 'false'
+				// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:294:18: 'false'
 				{
-				DebugLocation(260, 18);
+				DebugLocation(294, 18);
 				Match("false"); 
 
 
@@ -2749,8 +2897,8 @@ private void mBOOL()
 		}
 		finally
 		{
-			TraceOut("BOOL", 57);
-			LeaveRule("BOOL", 57);
+			TraceOut("BOOL", 61);
+			LeaveRule("BOOL", 61);
 			LeaveRule_BOOL();
 		}
 	}
@@ -2764,17 +2912,17 @@ private void mBOOL()
 	private void mNULL()
 	{
 		EnterRule_NULL();
-		EnterRule("NULL", 58);
-		TraceIn("NULL", 58);
+		EnterRule("NULL", 62);
+		TraceIn("NULL", 62);
 		try
 		{
 			int _type = NULL;
 			int _channel = DefaultTokenChannel;
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:262:6: ( 'null' )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:296:6: ( 'null' )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:262:8: 'null'
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:296:8: 'null'
 			{
-			DebugLocation(262, 8);
+			DebugLocation(296, 8);
 			Match("null"); 
 
 
@@ -2785,8 +2933,8 @@ private void mNULL()
 		}
 		finally
 		{
-			TraceOut("NULL", 58);
-			LeaveRule("NULL", 58);
+			TraceOut("NULL", 62);
+			LeaveRule("NULL", 62);
 			LeaveRule_NULL();
 		}
 	}
@@ -2800,21 +2948,21 @@ private void mNULL()
 	private void mDATETIME()
 	{
 		EnterRule_DATETIME();
-		EnterRule("DATETIME", 59);
-		TraceIn("DATETIME", 59);
+		EnterRule("DATETIME", 63);
+		TraceIn("DATETIME", 63);
 		try
 		{
 			int _type = DATETIME;
 			int _channel = DefaultTokenChannel;
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:265:2: ( 'datetime\\'' ( '0' .. '9' )+ '-' ( '0' .. '9' )+ ( '-' )+ ( '0' .. '9' )+ 'T' ( '0' .. '9' )+ ':' ( '0' .. '9' )+ ( ':' ( '0' .. '9' )+ ( '.' ( '0' .. '9' )+ )* )* ( 'Z' )? '\\'' )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:299:2: ( 'datetime\\'' ( '0' .. '9' )+ '-' ( '0' .. '9' )+ ( '-' )+ ( '0' .. '9' )+ 'T' ( '0' .. '9' )+ ':' ( '0' .. '9' )+ ( ':' ( '0' .. '9' )+ ( '.' ( '0' .. '9' )+ )* )* ( 'Z' )? '\\'' )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:265:4: 'datetime\\'' ( '0' .. '9' )+ '-' ( '0' .. '9' )+ ( '-' )+ ( '0' .. '9' )+ 'T' ( '0' .. '9' )+ ':' ( '0' .. '9' )+ ( ':' ( '0' .. '9' )+ ( '.' ( '0' .. '9' )+ )* )* ( 'Z' )? '\\''
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:299:4: 'datetime\\'' ( '0' .. '9' )+ '-' ( '0' .. '9' )+ ( '-' )+ ( '0' .. '9' )+ 'T' ( '0' .. '9' )+ ':' ( '0' .. '9' )+ ( ':' ( '0' .. '9' )+ ( '.' ( '0' .. '9' )+ )* )* ( 'Z' )? '\\''
 			{
-			DebugLocation(265, 4);
+			DebugLocation(299, 4);
 			Match("datetime'"); 
 
-			DebugLocation(265, 20);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:265:20: ( '0' .. '9' )+
+			DebugLocation(299, 20);
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:299:20: ( '0' .. '9' )+
 			int cnt16=0;
 			try { DebugEnterSubRule(16);
 			while (true)
@@ -2834,9 +2982,9 @@ private void mDATETIME()
 				{
 				case 1:
 					DebugEnterAlt(1);
-					// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:
+					// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:
 					{
-					DebugLocation(265, 20);
+					DebugLocation(299, 20);
 					input.Consume();
 
 
@@ -2858,10 +3006,10 @@ private void mDATETIME()
 
 			} finally { DebugExitSubRule(16); }
 
-			DebugLocation(265, 27);
+			DebugLocation(299, 27);
 			Match('-'); 
-			DebugLocation(265, 34);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:265:34: ( '0' .. '9' )+
+			DebugLocation(299, 34);
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:299:34: ( '0' .. '9' )+
 			int cnt17=0;
 			try { DebugEnterSubRule(17);
 			while (true)
@@ -2881,9 +3029,9 @@ private void mDATETIME()
 				{
 				case 1:
 					DebugEnterAlt(1);
-					// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:
+					// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:
 					{
-					DebugLocation(265, 34);
+					DebugLocation(299, 34);
 					input.Consume();
 
 
@@ -2905,8 +3053,8 @@ private void mDATETIME()
 
 			} finally { DebugExitSubRule(17); }
 
-			DebugLocation(265, 41);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:265:41: ( '-' )+
+			DebugLocation(299, 41);
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:299:41: ( '-' )+
 			int cnt18=0;
 			try { DebugEnterSubRule(18);
 			while (true)
@@ -2926,9 +3074,9 @@ private void mDATETIME()
 				{
 				case 1:
 					DebugEnterAlt(1);
-					// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:265:41: '-'
+					// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:299:41: '-'
 					{
-					DebugLocation(265, 41);
+					DebugLocation(299, 41);
 					Match('-'); 
 
 					}
@@ -2949,8 +3097,8 @@ private void mDATETIME()
 
 			} finally { DebugExitSubRule(18); }
 
-			DebugLocation(265, 50);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:265:50: ( '0' .. '9' )+
+			DebugLocation(299, 50);
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:299:50: ( '0' .. '9' )+
 			int cnt19=0;
 			try { DebugEnterSubRule(19);
 			while (true)
@@ -2970,9 +3118,9 @@ private void mDATETIME()
 				{
 				case 1:
 					DebugEnterAlt(1);
-					// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:
+					// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:
 					{
-					DebugLocation(265, 50);
+					DebugLocation(299, 50);
 					input.Consume();
 
 
@@ -2994,10 +3142,10 @@ private void mDATETIME()
 
 			} finally { DebugExitSubRule(19); }
 
-			DebugLocation(265, 57);
+			DebugLocation(299, 57);
 			Match('T'); 
-			DebugLocation(265, 64);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:265:64: ( '0' .. '9' )+
+			DebugLocation(299, 64);
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:299:64: ( '0' .. '9' )+
 			int cnt20=0;
 			try { DebugEnterSubRule(20);
 			while (true)
@@ -3017,9 +3165,9 @@ private void mDATETIME()
 				{
 				case 1:
 					DebugEnterAlt(1);
-					// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:
+					// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:
 					{
-					DebugLocation(265, 64);
+					DebugLocation(299, 64);
 					input.Consume();
 
 
@@ -3041,10 +3189,10 @@ private void mDATETIME()
 
 			} finally { DebugExitSubRule(20); }
 
-			DebugLocation(265, 71);
+			DebugLocation(299, 71);
 			Match(':'); 
-			DebugLocation(265, 78);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:265:78: ( '0' .. '9' )+
+			DebugLocation(299, 78);
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:299:78: ( '0' .. '9' )+
 			int cnt21=0;
 			try { DebugEnterSubRule(21);
 			while (true)
@@ -3064,9 +3212,9 @@ private void mDATETIME()
 				{
 				case 1:
 					DebugEnterAlt(1);
-					// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:
+					// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:
 					{
-					DebugLocation(265, 78);
+					DebugLocation(299, 78);
 					input.Consume();
 
 
@@ -3088,8 +3236,8 @@ private void mDATETIME()
 
 			} finally { DebugExitSubRule(21); }
 
-			DebugLocation(265, 85);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:265:85: ( ':' ( '0' .. '9' )+ ( '.' ( '0' .. '9' )+ )* )*
+			DebugLocation(299, 85);
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:299:85: ( ':' ( '0' .. '9' )+ ( '.' ( '0' .. '9' )+ )* )*
 			try { DebugEnterSubRule(25);
 			while (true)
 			{
@@ -3108,12 +3256,12 @@ private void mDATETIME()
 				{
 				case 1:
 					DebugEnterAlt(1);
-					// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:265:86: ':' ( '0' .. '9' )+ ( '.' ( '0' .. '9' )+ )*
+					// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:299:86: ':' ( '0' .. '9' )+ ( '.' ( '0' .. '9' )+ )*
 					{
-					DebugLocation(265, 86);
+					DebugLocation(299, 86);
 					Match(':'); 
-					DebugLocation(265, 93);
-					// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:265:93: ( '0' .. '9' )+
+					DebugLocation(299, 93);
+					// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:299:93: ( '0' .. '9' )+
 					int cnt22=0;
 					try { DebugEnterSubRule(22);
 					while (true)
@@ -3133,9 +3281,9 @@ private void mDATETIME()
 						{
 						case 1:
 							DebugEnterAlt(1);
-							// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:
+							// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:
 							{
-							DebugLocation(265, 93);
+							DebugLocation(299, 93);
 							input.Consume();
 
 
@@ -3157,8 +3305,8 @@ private void mDATETIME()
 
 					} finally { DebugExitSubRule(22); }
 
-					DebugLocation(265, 100);
-					// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:265:100: ( '.' ( '0' .. '9' )+ )*
+					DebugLocation(299, 100);
+					// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:299:100: ( '.' ( '0' .. '9' )+ )*
 					try { DebugEnterSubRule(24);
 					while (true)
 					{
@@ -3177,12 +3325,12 @@ private void mDATETIME()
 						{
 						case 1:
 							DebugEnterAlt(1);
-							// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:265:101: '.' ( '0' .. '9' )+
+							// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:299:101: '.' ( '0' .. '9' )+
 							{
-							DebugLocation(265, 101);
+							DebugLocation(299, 101);
 							Match('.'); 
-							DebugLocation(265, 108);
-							// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:265:108: ( '0' .. '9' )+
+							DebugLocation(299, 108);
+							// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:299:108: ( '0' .. '9' )+
 							int cnt23=0;
 							try { DebugEnterSubRule(23);
 							while (true)
@@ -3202,9 +3350,9 @@ private void mDATETIME()
 								{
 								case 1:
 									DebugEnterAlt(1);
-									// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:
+									// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:
 									{
-									DebugLocation(265, 108);
+									DebugLocation(299, 108);
 									input.Consume();
 
 
@@ -3254,8 +3402,8 @@ private void mDATETIME()
 
 			} finally { DebugExitSubRule(25); }
 
-			DebugLocation(265, 119);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:265:119: ( 'Z' )?
+			DebugLocation(299, 119);
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:299:119: ( 'Z' )?
 			int alt26=2;
 			try { DebugEnterSubRule(26);
 			try { DebugEnterDecision(26, false);
@@ -3270,9 +3418,9 @@ private void mDATETIME()
 			{
 			case 1:
 				DebugEnterAlt(1);
-				// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:265:120: 'Z'
+				// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:299:120: 'Z'
 				{
-				DebugLocation(265, 120);
+				DebugLocation(299, 120);
 				Match('Z'); 
 
 				}
@@ -3281,7 +3429,7 @@ private void mDATETIME()
 			}
 			} finally { DebugExitSubRule(26); }
 
-			DebugLocation(265, 126);
+			DebugLocation(299, 126);
 			Match('\''); 
 
 			}
@@ -3291,8 +3439,8 @@ private void mDATETIME()
 		}
 		finally
 		{
-			TraceOut("DATETIME", 59);
-			LeaveRule("DATETIME", 59);
+			TraceOut("DATETIME", 63);
+			LeaveRule("DATETIME", 63);
 			LeaveRule_DATETIME();
 		}
 	}
@@ -3306,60 +3454,60 @@ private void mDATETIME()
 	private void mGUID()
 	{
 		EnterRule_GUID();
-		EnterRule("GUID", 60);
-		TraceIn("GUID", 60);
+		EnterRule("GUID", 64);
+		TraceIn("GUID", 64);
 		try
 		{
 			int _type = GUID;
 			int _channel = DefaultTokenChannel;
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:267:6: ( 'guid\\'' HEX_PAIR HEX_PAIR HEX_PAIR HEX_PAIR '-' HEX_PAIR HEX_PAIR '-' HEX_PAIR HEX_PAIR '-' HEX_PAIR HEX_PAIR '-' HEX_PAIR HEX_PAIR HEX_PAIR HEX_PAIR HEX_PAIR HEX_PAIR '\\'' )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:301:6: ( 'guid\\'' HEX_PAIR HEX_PAIR HEX_PAIR HEX_PAIR '-' HEX_PAIR HEX_PAIR '-' HEX_PAIR HEX_PAIR '-' HEX_PAIR HEX_PAIR '-' HEX_PAIR HEX_PAIR HEX_PAIR HEX_PAIR HEX_PAIR HEX_PAIR '\\'' )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:267:8: 'guid\\'' HEX_PAIR HEX_PAIR HEX_PAIR HEX_PAIR '-' HEX_PAIR HEX_PAIR '-' HEX_PAIR HEX_PAIR '-' HEX_PAIR HEX_PAIR '-' HEX_PAIR HEX_PAIR HEX_PAIR HEX_PAIR HEX_PAIR HEX_PAIR '\\''
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:301:8: 'guid\\'' HEX_PAIR HEX_PAIR HEX_PAIR HEX_PAIR '-' HEX_PAIR HEX_PAIR '-' HEX_PAIR HEX_PAIR '-' HEX_PAIR HEX_PAIR '-' HEX_PAIR HEX_PAIR HEX_PAIR HEX_PAIR HEX_PAIR HEX_PAIR '\\''
 			{
-			DebugLocation(267, 8);
+			DebugLocation(301, 8);
 			Match("guid'"); 
 
-			DebugLocation(267, 17);
+			DebugLocation(301, 17);
 			mHEX_PAIR(); 
-			DebugLocation(267, 26);
+			DebugLocation(301, 26);
 			mHEX_PAIR(); 
-			DebugLocation(267, 35);
+			DebugLocation(301, 35);
 			mHEX_PAIR(); 
-			DebugLocation(267, 44);
+			DebugLocation(301, 44);
 			mHEX_PAIR(); 
-			DebugLocation(267, 53);
+			DebugLocation(301, 53);
 			Match('-'); 
-			DebugLocation(267, 57);
+			DebugLocation(301, 57);
 			mHEX_PAIR(); 
-			DebugLocation(267, 66);
+			DebugLocation(301, 66);
 			mHEX_PAIR(); 
-			DebugLocation(267, 75);
+			DebugLocation(301, 75);
 			Match('-'); 
-			DebugLocation(267, 79);
+			DebugLocation(301, 79);
 			mHEX_PAIR(); 
-			DebugLocation(267, 88);
+			DebugLocation(301, 88);
 			mHEX_PAIR(); 
-			DebugLocation(267, 97);
+			DebugLocation(301, 97);
 			Match('-'); 
-			DebugLocation(267, 101);
+			DebugLocation(301, 101);
 			mHEX_PAIR(); 
-			DebugLocation(267, 110);
+			DebugLocation(301, 110);
 			mHEX_PAIR(); 
-			DebugLocation(267, 119);
+			DebugLocation(301, 119);
 			Match('-'); 
-			DebugLocation(267, 123);
+			DebugLocation(301, 123);
 			mHEX_PAIR(); 
-			DebugLocation(267, 132);
+			DebugLocation(301, 132);
 			mHEX_PAIR(); 
-			DebugLocation(267, 141);
+			DebugLocation(301, 141);
 			mHEX_PAIR(); 
-			DebugLocation(267, 150);
+			DebugLocation(301, 150);
 			mHEX_PAIR(); 
-			DebugLocation(267, 159);
+			DebugLocation(301, 159);
 			mHEX_PAIR(); 
-			DebugLocation(267, 168);
+			DebugLocation(301, 168);
 			mHEX_PAIR(); 
-			DebugLocation(267, 177);
+			DebugLocation(301, 177);
 			Match('\''); 
 
 			}
@@ -3369,8 +3517,8 @@ private void mGUID()
 		}
 		finally
 		{
-			TraceOut("GUID", 60);
-			LeaveRule("GUID", 60);
+			TraceOut("GUID", 64);
+			LeaveRule("GUID", 64);
 			LeaveRule_GUID();
 		}
 	}
@@ -3384,20 +3532,20 @@ private void mGUID()
 	private void mBYTE()
 	{
 		EnterRule_BYTE();
-		EnterRule("BYTE", 61);
-		TraceIn("BYTE", 61);
+		EnterRule("BYTE", 65);
+		TraceIn("BYTE", 65);
 		try
 		{
 			int _type = BYTE;
 			int _channel = DefaultTokenChannel;
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:269:6: ( '0x' HEX_PAIR )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:303:6: ( '0x' HEX_PAIR )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:269:8: '0x' HEX_PAIR
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:303:8: '0x' HEX_PAIR
 			{
-			DebugLocation(269, 8);
+			DebugLocation(303, 8);
 			Match("0x"); 
 
-			DebugLocation(269, 13);
+			DebugLocation(303, 13);
 			mHEX_PAIR(); 
 
 			}
@@ -3407,8 +3555,8 @@ private void mBYTE()
 		}
 		finally
 		{
-			TraceOut("BYTE", 61);
-			LeaveRule("BYTE", 61);
+			TraceOut("BYTE", 65);
+			LeaveRule("BYTE", 65);
 			LeaveRule_BYTE();
 		}
 	}
@@ -3422,18 +3570,18 @@ private void mBYTE()
 	private void mSPACE()
 	{
 		EnterRule_SPACE();
-		EnterRule("SPACE", 62);
-		TraceIn("SPACE", 62);
+		EnterRule("SPACE", 66);
+		TraceIn("SPACE", 66);
 		try
 		{
 			int _type = SPACE;
 			int _channel = DefaultTokenChannel;
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:271:7: ( ( ' ' | '\\t' )+ )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:305:7: ( ( ' ' | '\\t' )+ )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:271:9: ( ' ' | '\\t' )+
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:305:9: ( ' ' | '\\t' )+
 			{
-			DebugLocation(271, 9);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:271:9: ( ' ' | '\\t' )+
+			DebugLocation(305, 9);
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:305:9: ( ' ' | '\\t' )+
 			int cnt27=0;
 			try { DebugEnterSubRule(27);
 			while (true)
@@ -3453,9 +3601,9 @@ private void mSPACE()
 				{
 				case 1:
 					DebugEnterAlt(1);
-					// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:
+					// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:
 					{
-					DebugLocation(271, 9);
+					DebugLocation(305, 9);
 					input.Consume();
 
 
@@ -3485,8 +3633,8 @@ private void mSPACE()
 		}
 		finally
 		{
-			TraceOut("SPACE", 62);
-			LeaveRule("SPACE", 62);
+			TraceOut("SPACE", 66);
+			LeaveRule("SPACE", 66);
 			LeaveRule_SPACE();
 		}
 	}
@@ -3500,18 +3648,18 @@ private void mSPACE()
 	private void mNEWLINE()
 	{
 		EnterRule_NEWLINE();
-		EnterRule("NEWLINE", 63);
-		TraceIn("NEWLINE", 63);
+		EnterRule("NEWLINE", 67);
+		TraceIn("NEWLINE", 67);
 		try
 		{
 			int _type = NEWLINE;
 			int _channel = DefaultTokenChannel;
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:273:9: ( ( '\\r' | '\\n' )+ )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:307:9: ( ( '\\r' | '\\n' )+ )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:273:11: ( '\\r' | '\\n' )+
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:307:11: ( '\\r' | '\\n' )+
 			{
-			DebugLocation(273, 11);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:273:11: ( '\\r' | '\\n' )+
+			DebugLocation(307, 11);
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:307:11: ( '\\r' | '\\n' )+
 			int cnt28=0;
 			try { DebugEnterSubRule(28);
 			while (true)
@@ -3531,9 +3679,9 @@ private void mNEWLINE()
 				{
 				case 1:
 					DebugEnterAlt(1);
-					// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:
+					// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:
 					{
-					DebugLocation(273, 11);
+					DebugLocation(307, 11);
 					input.Consume();
 
 
@@ -3563,8 +3711,8 @@ private void mNEWLINE()
 		}
 		finally
 		{
-			TraceOut("NEWLINE", 63);
-			LeaveRule("NEWLINE", 63);
+			TraceOut("NEWLINE", 67);
+			LeaveRule("NEWLINE", 67);
 			LeaveRule_NEWLINE();
 		}
 	}
@@ -3578,20 +3726,20 @@ private void mNEWLINE()
 	private void mDYNAMICIDENTIFIER()
 	{
 		EnterRule_DYNAMICIDENTIFIER();
-		EnterRule("DYNAMICIDENTIFIER", 64);
-		TraceIn("DYNAMICIDENTIFIER", 64);
+		EnterRule("DYNAMICIDENTIFIER", 68);
+		TraceIn("DYNAMICIDENTIFIER", 68);
 		try
 		{
 			int _type = DYNAMICIDENTIFIER;
 			int _channel = DefaultTokenChannel;
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:276:2: ( '[' ( 'a' .. 'z' | 'A' .. 'Z' | '0' .. '9' | '_' )+ ']' )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:310:2: ( '[' ( 'a' .. 'z' | 'A' .. 'Z' | '0' .. '9' | '_' )+ ']' )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:276:4: '[' ( 'a' .. 'z' | 'A' .. 'Z' | '0' .. '9' | '_' )+ ']'
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:310:4: '[' ( 'a' .. 'z' | 'A' .. 'Z' | '0' .. '9' | '_' )+ ']'
 			{
-			DebugLocation(276, 4);
+			DebugLocation(310, 4);
 			Match('['); 
-			DebugLocation(276, 8);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:276:8: ( 'a' .. 'z' | 'A' .. 'Z' | '0' .. '9' | '_' )+
+			DebugLocation(310, 8);
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:310:8: ( 'a' .. 'z' | 'A' .. 'Z' | '0' .. '9' | '_' )+
 			int cnt29=0;
 			try { DebugEnterSubRule(29);
 			while (true)
@@ -3611,9 +3759,9 @@ private void mDYNAMICIDENTIFIER()
 				{
 				case 1:
 					DebugEnterAlt(1);
-					// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:
+					// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:
 					{
-					DebugLocation(276, 8);
+					DebugLocation(310, 8);
 					input.Consume();
 
 
@@ -3635,7 +3783,7 @@ private void mDYNAMICIDENTIFIER()
 
 			} finally { DebugExitSubRule(29); }
 
-			DebugLocation(276, 42);
+			DebugLocation(310, 42);
 			Match(']'); 
 
 			}
@@ -3645,8 +3793,8 @@ private void mDYNAMICIDENTIFIER()
 		}
 		finally
 		{
-			TraceOut("DYNAMICIDENTIFIER", 64);
-			LeaveRule("DYNAMICIDENTIFIER", 64);
+			TraceOut("DYNAMICIDENTIFIER", 68);
+			LeaveRule("DYNAMICIDENTIFIER", 68);
 			LeaveRule_DYNAMICIDENTIFIER();
 		}
 	}
@@ -3660,17 +3808,17 @@ private void mDYNAMICIDENTIFIER()
 	private void mHEX_PAIR()
 	{
 		EnterRule_HEX_PAIR();
-		EnterRule("HEX_PAIR", 65);
-		TraceIn("HEX_PAIR", 65);
+		EnterRule("HEX_PAIR", 69);
+		TraceIn("HEX_PAIR", 69);
 		try
 		{
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:281:2: ( HEX_DIGIT HEX_DIGIT )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:315:2: ( HEX_DIGIT HEX_DIGIT )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:281:4: HEX_DIGIT HEX_DIGIT
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:315:4: HEX_DIGIT HEX_DIGIT
 			{
-			DebugLocation(281, 4);
+			DebugLocation(315, 4);
 			mHEX_DIGIT(); 
-			DebugLocation(281, 14);
+			DebugLocation(315, 14);
 			mHEX_DIGIT(); 
 
 			}
@@ -3678,8 +3826,8 @@ private void mHEX_PAIR()
 		}
 		finally
 		{
-			TraceOut("HEX_PAIR", 65);
-			LeaveRule("HEX_PAIR", 65);
+			TraceOut("HEX_PAIR", 69);
+			LeaveRule("HEX_PAIR", 69);
 			LeaveRule_HEX_PAIR();
 		}
 	}
@@ -3693,17 +3841,17 @@ private void mHEX_PAIR()
 	private void mIDENTIFIER()
 	{
 		EnterRule_IDENTIFIER();
-		EnterRule("IDENTIFIER", 66);
-		TraceIn("IDENTIFIER", 66);
+		EnterRule("IDENTIFIER", 70);
+		TraceIn("IDENTIFIER", 70);
 		try
 		{
 			int _type = IDENTIFIER;
 			int _channel = DefaultTokenChannel;
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:283:2: ( ( 'a' .. 'z' | 'A' .. 'Z' ) ( 'a' .. 'z' | 'A' .. 'Z' | '0' .. '9' | '_' )* )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:317:2: ( ( 'a' .. 'z' | 'A' .. 'Z' ) ( 'a' .. 'z' | 'A' .. 'Z' | '0' .. '9' | '_' )* )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:283:4: ( 'a' .. 'z' | 'A' .. 'Z' ) ( 'a' .. 'z' | 'A' .. 'Z' | '0' .. '9' | '_' )*
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:317:4: ( 'a' .. 'z' | 'A' .. 'Z' ) ( 'a' .. 'z' | 'A' .. 'Z' | '0' .. '9' | '_' )*
 			{
-			DebugLocation(283, 4);
+			DebugLocation(317, 4);
 			if ((input.LA(1)>='A' && input.LA(1)<='Z')||(input.LA(1)>='a' && input.LA(1)<='z'))
 			{
 				input.Consume();
@@ -3716,8 +3864,8 @@ private void mIDENTIFIER()
 				throw mse;
 			}
 
-			DebugLocation(283, 24);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:283:24: ( 'a' .. 'z' | 'A' .. 'Z' | '0' .. '9' | '_' )*
+			DebugLocation(317, 24);
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:317:24: ( 'a' .. 'z' | 'A' .. 'Z' | '0' .. '9' | '_' )*
 			try { DebugEnterSubRule(30);
 			while (true)
 			{
@@ -3736,9 +3884,9 @@ private void mIDENTIFIER()
 				{
 				case 1:
 					DebugEnterAlt(1);
-					// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:
+					// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:
 					{
-					DebugLocation(283, 24);
+					DebugLocation(317, 24);
 					input.Consume();
 
 
@@ -3763,8 +3911,8 @@ private void mIDENTIFIER()
 		}
 		finally
 		{
-			TraceOut("IDENTIFIER", 66);
-			LeaveRule("IDENTIFIER", 66);
+			TraceOut("IDENTIFIER", 70);
+			LeaveRule("IDENTIFIER", 70);
 			LeaveRule_IDENTIFIER();
 		}
 	}
@@ -3778,20 +3926,20 @@ private void mIDENTIFIER()
 	private void mSTRING()
 	{
 		EnterRule_STRING();
-		EnterRule("STRING", 67);
-		TraceIn("STRING", 67);
+		EnterRule("STRING", 71);
+		TraceIn("STRING", 71);
 		try
 		{
 			int _type = STRING;
 			int _channel = DefaultTokenChannel;
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:285:9: ( '\\'' ( ESC_SEQ |~ ( '\\\\' | '\\'' ) )* '\\'' )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:319:9: ( '\\'' ( ESC_SEQ |~ ( '\\\\' | '\\'' ) )* '\\'' )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:285:12: '\\'' ( ESC_SEQ |~ ( '\\\\' | '\\'' ) )* '\\''
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:319:12: '\\'' ( ESC_SEQ |~ ( '\\\\' | '\\'' ) )* '\\''
 			{
-			DebugLocation(285, 12);
+			DebugLocation(319, 12);
 			Match('\''); 
-			DebugLocation(285, 17);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:285:17: ( ESC_SEQ |~ ( '\\\\' | '\\'' ) )*
+			DebugLocation(319, 17);
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:319:17: ( ESC_SEQ |~ ( '\\\\' | '\\'' ) )*
 			try { DebugEnterSubRule(31);
 			while (true)
 			{
@@ -3825,18 +3973,18 @@ private void mSTRING()
 				{
 				case 1:
 					DebugEnterAlt(1);
-					// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:285:18: ESC_SEQ
+					// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:319:18: ESC_SEQ
 					{
-					DebugLocation(285, 18);
+					DebugLocation(319, 18);
 					mESC_SEQ(); 
 
 					}
 					break;
 				case 2:
 					DebugEnterAlt(2);
-					// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:285:27: ~ ( '\\\\' | '\\'' )
+					// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:319:27: ~ ( '\\\\' | '\\'' )
 					{
-					DebugLocation(285, 27);
+					DebugLocation(319, 27);
 					input.Consume();
 
 
@@ -3853,7 +4001,7 @@ private void mSTRING()
 
 			} finally { DebugExitSubRule(31); }
 
-			DebugLocation(285, 42);
+			DebugLocation(319, 42);
 			Match('\''); 
 
 			}
@@ -3863,8 +4011,8 @@ private void mSTRING()
 		}
 		finally
 		{
-			TraceOut("STRING", 67);
-			LeaveRule("STRING", 67);
+			TraceOut("STRING", 71);
+			LeaveRule("STRING", 71);
 			LeaveRule_STRING();
 		}
 	}
@@ -3878,15 +4026,15 @@ private void mSTRING()
 	private void mHEX_DIGIT()
 	{
 		EnterRule_HEX_DIGIT();
-		EnterRule("HEX_DIGIT", 68);
-		TraceIn("HEX_DIGIT", 68);
+		EnterRule("HEX_DIGIT", 72);
+		TraceIn("HEX_DIGIT", 72);
 		try
 		{
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:289:11: ( ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:323:11: ( ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:
 			{
-			DebugLocation(289, 11);
+			DebugLocation(323, 11);
 			if ((input.LA(1)>='0' && input.LA(1)<='9')||(input.LA(1)>='A' && input.LA(1)<='F')||(input.LA(1)>='a' && input.LA(1)<='f'))
 			{
 				input.Consume();
@@ -3905,8 +4053,8 @@ private void mHEX_DIGIT()
 		}
 		finally
 		{
-			TraceOut("HEX_DIGIT", 68);
-			LeaveRule("HEX_DIGIT", 68);
+			TraceOut("HEX_DIGIT", 72);
+			LeaveRule("HEX_DIGIT", 72);
 			LeaveRule_HEX_DIGIT();
 		}
 	}
@@ -3920,11 +4068,11 @@ private void mHEX_DIGIT()
 	private void mESC_SEQ()
 	{
 		EnterRule_ESC_SEQ();
-		EnterRule("ESC_SEQ", 69);
-		TraceIn("ESC_SEQ", 69);
+		EnterRule("ESC_SEQ", 73);
+		TraceIn("ESC_SEQ", 73);
 		try
 		{
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:293:2: ( '\\'\\'' | '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | UNICODE_ESC | OCTAL_ESC )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:327:2: ( '\\'\\'' | '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | UNICODE_ESC | OCTAL_ESC )
 			int alt32=4;
 			try { DebugEnterDecision(32, false);
 			int LA32_1 = input.LA(1);
@@ -3986,9 +4134,9 @@ private void mESC_SEQ()
 			{
 			case 1:
 				DebugEnterAlt(1);
-				// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:293:4: '\\'\\''
+				// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:327:4: '\\'\\''
 				{
-				DebugLocation(293, 4);
+				DebugLocation(327, 4);
 				Match("''"); 
 
 
@@ -3996,11 +4144,11 @@ private void mESC_SEQ()
 				break;
 			case 2:
 				DebugEnterAlt(2);
-				// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:294:5: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' )
+				// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:328:5: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' )
 				{
-				DebugLocation(294, 5);
+				DebugLocation(328, 5);
 				Match('\\'); 
-				DebugLocation(294, 10);
+				DebugLocation(328, 10);
 				input.Consume();
 
 
@@ -4008,18 +4156,18 @@ private void mESC_SEQ()
 				break;
 			case 3:
 				DebugEnterAlt(3);
-				// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:295:5: UNICODE_ESC
+				// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:329:5: UNICODE_ESC
 				{
-				DebugLocation(295, 5);
+				DebugLocation(329, 5);
 				mUNICODE_ESC(); 
 
 				}
 				break;
 			case 4:
 				DebugEnterAlt(4);
-				// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:296:5: OCTAL_ESC
+				// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:330:5: OCTAL_ESC
 				{
-				DebugLocation(296, 5);
+				DebugLocation(330, 5);
 				mOCTAL_ESC(); 
 
 				}
@@ -4029,8 +4177,8 @@ private void mESC_SEQ()
 		}
 		finally
 		{
-			TraceOut("ESC_SEQ", 69);
-			LeaveRule("ESC_SEQ", 69);
+			TraceOut("ESC_SEQ", 73);
+			LeaveRule("ESC_SEQ", 73);
 			LeaveRule_ESC_SEQ();
 		}
 	}
@@ -4044,11 +4192,11 @@ private void mESC_SEQ()
 	private void mOCTAL_ESC()
 	{
 		EnterRule_OCTAL_ESC();
-		EnterRule("OCTAL_ESC", 70);
-		TraceIn("OCTAL_ESC", 70);
+		EnterRule("OCTAL_ESC", 74);
+		TraceIn("OCTAL_ESC", 74);
 		try
 		{
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:301:3: ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:335:3: ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) )
 			int alt33=3;
 			try { DebugEnterDecision(33, false);
 			int LA33_1 = input.LA(1);
@@ -4110,17 +4258,17 @@ private void mOCTAL_ESC()
 			{
 			case 1:
 				DebugEnterAlt(1);
-				// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:301:7: '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' )
+				// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:335:7: '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' )
 				{
-				DebugLocation(301, 7);
+				DebugLocation(335, 7);
 				Match('\\'); 
-				DebugLocation(301, 12);
+				DebugLocation(335, 12);
 				input.Consume();
 
-				DebugLocation(301, 23);
+				DebugLocation(335, 23);
 				input.Consume();
 
-				DebugLocation(301, 34);
+				DebugLocation(335, 34);
 				input.Consume();
 
 
@@ -4128,14 +4276,14 @@ private void mOCTAL_ESC()
 				break;
 			case 2:
 				DebugEnterAlt(2);
-				// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:302:7: '\\\\' ( '0' .. '7' ) ( '0' .. '7' )
+				// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:336:7: '\\\\' ( '0' .. '7' ) ( '0' .. '7' )
 				{
-				DebugLocation(302, 7);
+				DebugLocation(336, 7);
 				Match('\\'); 
-				DebugLocation(302, 12);
+				DebugLocation(336, 12);
 				input.Consume();
 
-				DebugLocation(302, 23);
+				DebugLocation(336, 23);
 				input.Consume();
 
 
@@ -4143,11 +4291,11 @@ private void mOCTAL_ESC()
 				break;
 			case 3:
 				DebugEnterAlt(3);
-				// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:303:7: '\\\\' ( '0' .. '7' )
+				// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:337:7: '\\\\' ( '0' .. '7' )
 				{
-				DebugLocation(303, 7);
+				DebugLocation(337, 7);
 				Match('\\'); 
-				DebugLocation(303, 12);
+				DebugLocation(337, 12);
 				input.Consume();
 
 
@@ -4158,8 +4306,8 @@ private void mOCTAL_ESC()
 		}
 		finally
 		{
-			TraceOut("OCTAL_ESC", 70);
-			LeaveRule("OCTAL_ESC", 70);
+			TraceOut("OCTAL_ESC", 74);
+			LeaveRule("OCTAL_ESC", 74);
 			LeaveRule_OCTAL_ESC();
 		}
 	}
@@ -4173,25 +4321,25 @@ private void mOCTAL_ESC()
 	private void mUNICODE_ESC()
 	{
 		EnterRule_UNICODE_ESC();
-		EnterRule("UNICODE_ESC", 71);
-		TraceIn("UNICODE_ESC", 71);
+		EnterRule("UNICODE_ESC", 75);
+		TraceIn("UNICODE_ESC", 75);
 		try
 		{
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:308:3: ( '\\\\' 'u' HEX_DIGIT HEX_DIGIT HEX_DIGIT HEX_DIGIT )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:342:3: ( '\\\\' 'u' HEX_DIGIT HEX_DIGIT HEX_DIGIT HEX_DIGIT )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:308:7: '\\\\' 'u' HEX_DIGIT HEX_DIGIT HEX_DIGIT HEX_DIGIT
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:342:7: '\\\\' 'u' HEX_DIGIT HEX_DIGIT HEX_DIGIT HEX_DIGIT
 			{
-			DebugLocation(308, 7);
+			DebugLocation(342, 7);
 			Match('\\'); 
-			DebugLocation(308, 12);
+			DebugLocation(342, 12);
 			Match('u'); 
-			DebugLocation(308, 16);
+			DebugLocation(342, 16);
 			mHEX_DIGIT(); 
-			DebugLocation(308, 26);
+			DebugLocation(342, 26);
 			mHEX_DIGIT(); 
-			DebugLocation(308, 36);
+			DebugLocation(342, 36);
 			mHEX_DIGIT(); 
-			DebugLocation(308, 46);
+			DebugLocation(342, 46);
 			mHEX_DIGIT(); 
 
 			}
@@ -4199,8 +4347,8 @@ private void mUNICODE_ESC()
 		}
 		finally
 		{
-			TraceOut("UNICODE_ESC", 71);
-			LeaveRule("UNICODE_ESC", 71);
+			TraceOut("UNICODE_ESC", 75);
+			LeaveRule("UNICODE_ESC", 75);
 			LeaveRule_UNICODE_ESC();
 		}
 	}
@@ -4208,8 +4356,8 @@ private void mUNICODE_ESC()
 
 	public override void mTokens()
 	{
-		// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:8: ( T__70 | T__71 | T__72 | T__73 | T__74 | T__75 | ASSIGN | EQUALS | NOTEQUALS | GREATERTHAN | GREATERTHANOREQUAL | LESSTHAN | LESSTHANOREQUAL | NOT | OR | AND | ASC | DESC | ALLPAGES | NONE | SKIP | TOP | FILTER | ORDERBY | SELECT | INLINECOUNT | EXPAND | IGNORED | STARTSWITH | ENDSWITH | SUBSTRINGOF | TOLOWER | TOUPPER | YEAR | YEARS | MONTH | DAY | DAYS | HOUR | HOURS | MINUTE | MINUTES | SECOND | SECONDS | ANY | ALL | COUNT | MIN | MAX | SUM | AVERAGE | INT | LONG | DOUBLE | SINGLE | DECIMAL | BOOL | NULL | DATETIME | GUID | BYTE | SPACE | NEWLINE | DYNAMICIDENTIFIER | IDENTIFIER | STRING )
-		int alt34=66;
+		// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:8: ( T__74 | T__75 | T__76 | T__77 | T__78 | T__79 | ASSIGN | EQUALS | NOTEQUALS | GREATERTHAN | GREATERTHANOREQUAL | LESSTHAN | LESSTHANOREQUAL | NOT | OR | AND | ASC | DESC | ALLPAGES | NONE | SKIP | TOP | FILTER | ORDERBY | SELECT | APPLY | AGGREGATE | INLINECOUNT | EXPAND | IGNORED | STARTSWITH | ENDSWITH | SUBSTRINGOF | TOLOWER | TOUPPER | YEAR | YEARS | MONTH | DAY | DAYS | HOUR | HOURS | MINUTE | MINUTES | SECOND | SECONDS | ANY | ALL | COUNT | MIN | MAX | SUM | AVERAGE | AS | WITH | INT | LONG | DOUBLE | SINGLE | DECIMAL | BOOL | NULL | DATETIME | GUID | BYTE | SPACE | NEWLINE | DYNAMICIDENTIFIER | IDENTIFIER | STRING )
+		int alt34=70;
 		try { DebugEnterDecision(34, false);
 		try
 		{
@@ -4225,61 +4373,61 @@ public override void mTokens()
 		{
 		case 1:
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:10: T__70
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:10: T__74
 			{
 			DebugLocation(1, 10);
-			mT__70(); 
+			mT__74(); 
 
 			}
 			break;
 		case 2:
 			DebugEnterAlt(2);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:16: T__71
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:16: T__75
 			{
 			DebugLocation(1, 16);
-			mT__71(); 
+			mT__75(); 
 
 			}
 			break;
 		case 3:
 			DebugEnterAlt(3);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:22: T__72
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:22: T__76
 			{
 			DebugLocation(1, 22);
-			mT__72(); 
+			mT__76(); 
 
 			}
 			break;
 		case 4:
 			DebugEnterAlt(4);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:28: T__73
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:28: T__77
 			{
 			DebugLocation(1, 28);
-			mT__73(); 
+			mT__77(); 
 
 			}
 			break;
 		case 5:
 			DebugEnterAlt(5);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:34: T__74
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:34: T__78
 			{
 			DebugLocation(1, 34);
-			mT__74(); 
+			mT__78(); 
 
 			}
 			break;
 		case 6:
 			DebugEnterAlt(6);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:40: T__75
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:40: T__79
 			{
 			DebugLocation(1, 40);
-			mT__75(); 
+			mT__79(); 
 
 			}
 			break;
 		case 7:
 			DebugEnterAlt(7);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:46: ASSIGN
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:46: ASSIGN
 			{
 			DebugLocation(1, 46);
 			mASSIGN(); 
@@ -4288,7 +4436,7 @@ public override void mTokens()
 			break;
 		case 8:
 			DebugEnterAlt(8);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:53: EQUALS
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:53: EQUALS
 			{
 			DebugLocation(1, 53);
 			mEQUALS(); 
@@ -4297,7 +4445,7 @@ public override void mTokens()
 			break;
 		case 9:
 			DebugEnterAlt(9);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:60: NOTEQUALS
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:60: NOTEQUALS
 			{
 			DebugLocation(1, 60);
 			mNOTEQUALS(); 
@@ -4306,7 +4454,7 @@ public override void mTokens()
 			break;
 		case 10:
 			DebugEnterAlt(10);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:70: GREATERTHAN
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:70: GREATERTHAN
 			{
 			DebugLocation(1, 70);
 			mGREATERTHAN(); 
@@ -4315,7 +4463,7 @@ public override void mTokens()
 			break;
 		case 11:
 			DebugEnterAlt(11);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:82: GREATERTHANOREQUAL
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:82: GREATERTHANOREQUAL
 			{
 			DebugLocation(1, 82);
 			mGREATERTHANOREQUAL(); 
@@ -4324,7 +4472,7 @@ public override void mTokens()
 			break;
 		case 12:
 			DebugEnterAlt(12);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:101: LESSTHAN
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:101: LESSTHAN
 			{
 			DebugLocation(1, 101);
 			mLESSTHAN(); 
@@ -4333,7 +4481,7 @@ public override void mTokens()
 			break;
 		case 13:
 			DebugEnterAlt(13);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:110: LESSTHANOREQUAL
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:110: LESSTHANOREQUAL
 			{
 			DebugLocation(1, 110);
 			mLESSTHANOREQUAL(); 
@@ -4342,7 +4490,7 @@ public override void mTokens()
 			break;
 		case 14:
 			DebugEnterAlt(14);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:126: NOT
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:126: NOT
 			{
 			DebugLocation(1, 126);
 			mNOT(); 
@@ -4351,7 +4499,7 @@ public override void mTokens()
 			break;
 		case 15:
 			DebugEnterAlt(15);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:130: OR
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:130: OR
 			{
 			DebugLocation(1, 130);
 			mOR(); 
@@ -4360,7 +4508,7 @@ public override void mTokens()
 			break;
 		case 16:
 			DebugEnterAlt(16);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:133: AND
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:133: AND
 			{
 			DebugLocation(1, 133);
 			mAND(); 
@@ -4369,7 +4517,7 @@ public override void mTokens()
 			break;
 		case 17:
 			DebugEnterAlt(17);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:137: ASC
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:137: ASC
 			{
 			DebugLocation(1, 137);
 			mASC(); 
@@ -4378,7 +4526,7 @@ public override void mTokens()
 			break;
 		case 18:
 			DebugEnterAlt(18);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:141: DESC
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:141: DESC
 			{
 			DebugLocation(1, 141);
 			mDESC(); 
@@ -4387,7 +4535,7 @@ public override void mTokens()
 			break;
 		case 19:
 			DebugEnterAlt(19);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:146: ALLPAGES
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:146: ALLPAGES
 			{
 			DebugLocation(1, 146);
 			mALLPAGES(); 
@@ -4396,7 +4544,7 @@ public override void mTokens()
 			break;
 		case 20:
 			DebugEnterAlt(20);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:155: NONE
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:155: NONE
 			{
 			DebugLocation(1, 155);
 			mNONE(); 
@@ -4405,7 +4553,7 @@ public override void mTokens()
 			break;
 		case 21:
 			DebugEnterAlt(21);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:160: SKIP
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:160: SKIP
 			{
 			DebugLocation(1, 160);
 			mSKIP(); 
@@ -4414,7 +4562,7 @@ public override void mTokens()
 			break;
 		case 22:
 			DebugEnterAlt(22);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:165: TOP
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:165: TOP
 			{
 			DebugLocation(1, 165);
 			mTOP(); 
@@ -4423,7 +4571,7 @@ public override void mTokens()
 			break;
 		case 23:
 			DebugEnterAlt(23);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:169: FILTER
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:169: FILTER
 			{
 			DebugLocation(1, 169);
 			mFILTER(); 
@@ -4432,7 +4580,7 @@ public override void mTokens()
 			break;
 		case 24:
 			DebugEnterAlt(24);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:176: ORDERBY
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:176: ORDERBY
 			{
 			DebugLocation(1, 176);
 			mORDERBY(); 
@@ -4441,7 +4589,7 @@ public override void mTokens()
 			break;
 		case 25:
 			DebugEnterAlt(25);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:184: SELECT
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:184: SELECT
 			{
 			DebugLocation(1, 184);
 			mSELECT(); 
@@ -4450,369 +4598,405 @@ public override void mTokens()
 			break;
 		case 26:
 			DebugEnterAlt(26);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:191: INLINECOUNT
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:191: APPLY
 			{
 			DebugLocation(1, 191);
-			mINLINECOUNT(); 
+			mAPPLY(); 
 
 			}
 			break;
 		case 27:
 			DebugEnterAlt(27);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:203: EXPAND
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:197: AGGREGATE
 			{
-			DebugLocation(1, 203);
-			mEXPAND(); 
+			DebugLocation(1, 197);
+			mAGGREGATE(); 
 
 			}
 			break;
 		case 28:
 			DebugEnterAlt(28);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:210: IGNORED
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:207: INLINECOUNT
 			{
-			DebugLocation(1, 210);
-			mIGNORED(); 
+			DebugLocation(1, 207);
+			mINLINECOUNT(); 
 
 			}
 			break;
 		case 29:
 			DebugEnterAlt(29);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:218: STARTSWITH
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:219: EXPAND
 			{
-			DebugLocation(1, 218);
-			mSTARTSWITH(); 
+			DebugLocation(1, 219);
+			mEXPAND(); 
 
 			}
 			break;
 		case 30:
 			DebugEnterAlt(30);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:229: ENDSWITH
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:226: IGNORED
 			{
-			DebugLocation(1, 229);
-			mENDSWITH(); 
+			DebugLocation(1, 226);
+			mIGNORED(); 
 
 			}
 			break;
 		case 31:
 			DebugEnterAlt(31);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:238: SUBSTRINGOF
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:234: STARTSWITH
 			{
-			DebugLocation(1, 238);
-			mSUBSTRINGOF(); 
+			DebugLocation(1, 234);
+			mSTARTSWITH(); 
 
 			}
 			break;
 		case 32:
 			DebugEnterAlt(32);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:250: TOLOWER
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:245: ENDSWITH
 			{
-			DebugLocation(1, 250);
-			mTOLOWER(); 
+			DebugLocation(1, 245);
+			mENDSWITH(); 
 
 			}
 			break;
 		case 33:
 			DebugEnterAlt(33);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:258: TOUPPER
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:254: SUBSTRINGOF
 			{
-			DebugLocation(1, 258);
-			mTOUPPER(); 
+			DebugLocation(1, 254);
+			mSUBSTRINGOF(); 
 
 			}
 			break;
 		case 34:
 			DebugEnterAlt(34);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:266: YEAR
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:266: TOLOWER
 			{
 			DebugLocation(1, 266);
-			mYEAR(); 
+			mTOLOWER(); 
 
 			}
 			break;
 		case 35:
 			DebugEnterAlt(35);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:271: YEARS
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:274: TOUPPER
 			{
-			DebugLocation(1, 271);
-			mYEARS(); 
+			DebugLocation(1, 274);
+			mTOUPPER(); 
 
 			}
 			break;
 		case 36:
 			DebugEnterAlt(36);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:277: MONTH
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:282: YEAR
 			{
-			DebugLocation(1, 277);
-			mMONTH(); 
+			DebugLocation(1, 282);
+			mYEAR(); 
 
 			}
 			break;
 		case 37:
 			DebugEnterAlt(37);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:283: DAY
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:287: YEARS
 			{
-			DebugLocation(1, 283);
-			mDAY(); 
+			DebugLocation(1, 287);
+			mYEARS(); 
 
 			}
 			break;
 		case 38:
 			DebugEnterAlt(38);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:287: DAYS
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:293: MONTH
 			{
-			DebugLocation(1, 287);
-			mDAYS(); 
+			DebugLocation(1, 293);
+			mMONTH(); 
 
 			}
 			break;
 		case 39:
 			DebugEnterAlt(39);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:292: HOUR
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:299: DAY
 			{
-			DebugLocation(1, 292);
-			mHOUR(); 
+			DebugLocation(1, 299);
+			mDAY(); 
 
 			}
 			break;
 		case 40:
 			DebugEnterAlt(40);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:297: HOURS
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:303: DAYS
 			{
-			DebugLocation(1, 297);
-			mHOURS(); 
+			DebugLocation(1, 303);
+			mDAYS(); 
 
 			}
 			break;
 		case 41:
 			DebugEnterAlt(41);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:303: MINUTE
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:308: HOUR
 			{
-			DebugLocation(1, 303);
-			mMINUTE(); 
+			DebugLocation(1, 308);
+			mHOUR(); 
 
 			}
 			break;
 		case 42:
 			DebugEnterAlt(42);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:310: MINUTES
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:313: HOURS
 			{
-			DebugLocation(1, 310);
-			mMINUTES(); 
+			DebugLocation(1, 313);
+			mHOURS(); 
 
 			}
 			break;
 		case 43:
 			DebugEnterAlt(43);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:318: SECOND
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:319: MINUTE
 			{
-			DebugLocation(1, 318);
-			mSECOND(); 
+			DebugLocation(1, 319);
+			mMINUTE(); 
 
 			}
 			break;
 		case 44:
 			DebugEnterAlt(44);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:325: SECONDS
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:326: MINUTES
 			{
-			DebugLocation(1, 325);
-			mSECONDS(); 
+			DebugLocation(1, 326);
+			mMINUTES(); 
 
 			}
 			break;
 		case 45:
 			DebugEnterAlt(45);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:333: ANY
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:334: SECOND
 			{
-			DebugLocation(1, 333);
-			mANY(); 
+			DebugLocation(1, 334);
+			mSECOND(); 
 
 			}
 			break;
 		case 46:
 			DebugEnterAlt(46);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:337: ALL
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:341: SECONDS
 			{
-			DebugLocation(1, 337);
-			mALL(); 
+			DebugLocation(1, 341);
+			mSECONDS(); 
 
 			}
 			break;
 		case 47:
 			DebugEnterAlt(47);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:341: COUNT
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:349: ANY
 			{
-			DebugLocation(1, 341);
-			mCOUNT(); 
+			DebugLocation(1, 349);
+			mANY(); 
 
 			}
 			break;
 		case 48:
 			DebugEnterAlt(48);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:347: MIN
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:353: ALL
 			{
-			DebugLocation(1, 347);
-			mMIN(); 
+			DebugLocation(1, 353);
+			mALL(); 
 
 			}
 			break;
 		case 49:
 			DebugEnterAlt(49);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:351: MAX
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:357: COUNT
 			{
-			DebugLocation(1, 351);
-			mMAX(); 
+			DebugLocation(1, 357);
+			mCOUNT(); 
 
 			}
 			break;
 		case 50:
 			DebugEnterAlt(50);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:355: SUM
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:363: MIN
 			{
-			DebugLocation(1, 355);
-			mSUM(); 
+			DebugLocation(1, 363);
+			mMIN(); 
 
 			}
 			break;
 		case 51:
 			DebugEnterAlt(51);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:359: AVERAGE
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:367: MAX
 			{
-			DebugLocation(1, 359);
-			mAVERAGE(); 
+			DebugLocation(1, 367);
+			mMAX(); 
 
 			}
 			break;
 		case 52:
 			DebugEnterAlt(52);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:367: INT
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:371: SUM
 			{
-			DebugLocation(1, 367);
-			mINT(); 
+			DebugLocation(1, 371);
+			mSUM(); 
 
 			}
 			break;
 		case 53:
 			DebugEnterAlt(53);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:371: LONG
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:375: AVERAGE
 			{
-			DebugLocation(1, 371);
-			mLONG(); 
+			DebugLocation(1, 375);
+			mAVERAGE(); 
 
 			}
 			break;
 		case 54:
 			DebugEnterAlt(54);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:376: DOUBLE
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:383: AS
 			{
-			DebugLocation(1, 376);
-			mDOUBLE(); 
+			DebugLocation(1, 383);
+			mAS(); 
 
 			}
 			break;
 		case 55:
 			DebugEnterAlt(55);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:383: SINGLE
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:386: WITH
 			{
-			DebugLocation(1, 383);
-			mSINGLE(); 
+			DebugLocation(1, 386);
+			mWITH(); 
 
 			}
 			break;
 		case 56:
 			DebugEnterAlt(56);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:390: DECIMAL
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:391: INT
 			{
-			DebugLocation(1, 390);
-			mDECIMAL(); 
+			DebugLocation(1, 391);
+			mINT(); 
 
 			}
 			break;
 		case 57:
 			DebugEnterAlt(57);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:398: BOOL
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:395: LONG
 			{
-			DebugLocation(1, 398);
-			mBOOL(); 
+			DebugLocation(1, 395);
+			mLONG(); 
 
 			}
 			break;
 		case 58:
 			DebugEnterAlt(58);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:403: NULL
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:400: DOUBLE
 			{
-			DebugLocation(1, 403);
-			mNULL(); 
+			DebugLocation(1, 400);
+			mDOUBLE(); 
 
 			}
 			break;
 		case 59:
 			DebugEnterAlt(59);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:408: DATETIME
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:407: SINGLE
 			{
-			DebugLocation(1, 408);
-			mDATETIME(); 
+			DebugLocation(1, 407);
+			mSINGLE(); 
 
 			}
 			break;
 		case 60:
 			DebugEnterAlt(60);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:417: GUID
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:414: DECIMAL
 			{
-			DebugLocation(1, 417);
-			mGUID(); 
+			DebugLocation(1, 414);
+			mDECIMAL(); 
 
 			}
 			break;
 		case 61:
 			DebugEnterAlt(61);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:422: BYTE
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:422: BOOL
 			{
 			DebugLocation(1, 422);
-			mBYTE(); 
+			mBOOL(); 
 
 			}
 			break;
 		case 62:
 			DebugEnterAlt(62);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:427: SPACE
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:427: NULL
 			{
 			DebugLocation(1, 427);
-			mSPACE(); 
+			mNULL(); 
 
 			}
 			break;
 		case 63:
 			DebugEnterAlt(63);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:433: NEWLINE
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:432: DATETIME
 			{
-			DebugLocation(1, 433);
-			mNEWLINE(); 
+			DebugLocation(1, 432);
+			mDATETIME(); 
 
 			}
 			break;
 		case 64:
 			DebugEnterAlt(64);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:441: DYNAMICIDENTIFIER
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:441: GUID
 			{
 			DebugLocation(1, 441);
-			mDYNAMICIDENTIFIER(); 
+			mGUID(); 
 
 			}
 			break;
 		case 65:
 			DebugEnterAlt(65);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:459: IDENTIFIER
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:446: BYTE
 			{
-			DebugLocation(1, 459);
-			mIDENTIFIER(); 
+			DebugLocation(1, 446);
+			mBYTE(); 
 
 			}
 			break;
 		case 66:
 			DebugEnterAlt(66);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:470: STRING
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:451: SPACE
+			{
+			DebugLocation(1, 451);
+			mSPACE(); 
+
+			}
+			break;
+		case 67:
+			DebugEnterAlt(67);
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:457: NEWLINE
+			{
+			DebugLocation(1, 457);
+			mNEWLINE(); 
+
+			}
+			break;
+		case 68:
+			DebugEnterAlt(68);
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:465: DYNAMICIDENTIFIER
 			{
-			DebugLocation(1, 470);
+			DebugLocation(1, 465);
+			mDYNAMICIDENTIFIER(); 
+
+			}
+			break;
+		case 69:
+			DebugEnterAlt(69);
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:483: IDENTIFIER
+			{
+			DebugLocation(1, 483);
+			mIDENTIFIER(); 
+
+			}
+			break;
+		case 70:
+			DebugEnterAlt(70);
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:1:494: STRING
+			{
+			DebugLocation(1, 494);
 			mSTRING(); 
 
 			}
@@ -4835,82 +5019,88 @@ protected override void InitDFAs()
 	private class DFA34 : DFA
 	{
 		private const string DFA34_eotS =
-			"\x8\xFFFF\x7\x1D\x1\xFFFF\x6\x1D\x1\xFFFF\x1\x43\x1\x1D\x1\x43\x5\xFFFF"+
-			"\x1\x47\x1\x1D\x1\x49\x2\x1D\x1\x4D\x1\x4E\x1\x1D\x1\x50\x1\x51\x1\x52"+
-			"\x6\x1D\x7\xFFFF\xB\x1D\x4\xFFFF\x1\x1D\x1\xFFFF\x1\x1D\x1\xFFFF\x1\x72"+
-			"\x2\x1D\x2\xFFFF\x1\x1D\x3\xFFFF\x1\x76\x1\x77\x1\x78\x1\x7A\x2\x1D\x1"+
-			"\x7E\x1\x1D\x7\xFFFF\x2\x1D\x1\x89\x6\x1D\x1\x91\x1\x92\x2\x1D\x1\x95"+
-			"\x2\x1D\x1\xFFFF\x1\x9A\x1\x9B\x1\x1D\x3\xFFFF\x1\x1D\x1\xFFFF\x1\x1D"+
-			"\x1\x9F\x1\xA0\x1\xFFFF\x1\x1D\x7\xFFFF\x2\x1D\x1\xFFFF\x3\x1D\x1\xAE"+
-			"\x1\xB0\x2\x1D\x2\xFFFF\x1\xB4\x1\x1D\x3\xFFFF\x2\x1D\x3\xFFFF\x2\x1D"+
-			"\x2\xFFFF\x1\x1D\x7\xFFFF\x5\x1D\x1\xFFFF\x1\xC7\x1\xFFFF\x1\xC8\x1\x1D"+
-			"\x1\xCA\x1\xFFFF\x1\xCB\x1\xAE\x4\x1D\x7\xFFFF\x2\x1D\x1\xD9\x2\x1D\x2"+
-			"\xFFFF\x1\xDD\x2\xFFFF\x2\x1D\x1\xE0\x1\x1D\x6\xFFFF\x2\x1D\x1\xE9\x1"+
-			"\xFFFF\x1\xEA\x1\xEB\x1\xEC\x1\xFFFF\x1\xED\x1\xEE\x1\xFFFF\x1\x1D\x5"+
-			"\xFFFF\x2\x1D\xC\xFFFF\x2\x1D\x2\xFFFF\x1\xFC\x1\x1D\x2\xFFFF\x1\xFF"+
-			"\x4\xFFFF";
+			"\x8\xFFFF\x7\x1E\x1\xFFFF\x7\x1E\x1\xFFFF\x1\x47\x1\x1E\x1\x47\x5\xFFFF"+
+			"\x1\x4B\x1\x1E\x1\x4D\x2\x1E\x1\x51\x1\x52\x1\x1E\x1\x54\x1\x55\x1\x56"+
+			"\x1\x1E\x1\x5A\x5\x1E\x8\xFFFF\xC\x1E\x4\xFFFF\x1\x1E\x1\xFFFF\x1\x1E"+
+			"\x1\xFFFF\x1\x7A\x2\x1E\x2\xFFFF\x1\x1E\x3\xFFFF\x1\x7E\x1\x7F\x1\x80"+
+			"\x1\xFFFF\x1\x82\x3\x1E\x1\x87\x1\x1E\x8\xFFFF\x2\x1E\x1\x93\x6\x1E\x1"+
+			"\x9B\x1\x9C\x3\x1E\x1\xA0\x2\x1E\x1\xFFFF\x1\xA5\x1\xA6\x1\x1E\x3\xFFFF"+
+			"\x1\x1E\x1\xFFFF\x2\x1E\x1\xAB\x1\xAC\x1\xFFFF\x1\x1E\x8\xFFFF\x2\x1E"+
+			"\x1\xFFFF\x3\x1E\x1\xBB\x1\xBD\x2\x1E\x2\xFFFF\x1\xC1\x1\x1E\x1\xC3\x3"+
+			"\xFFFF\x2\x1E\x3\xFFFF\x3\x1E\x2\xFFFF\x1\x1E\x8\xFFFF\x5\x1E\x1\xFFFF"+
+			"\x1\xD7\x1\xFFFF\x1\xD8\x1\x1E\x1\xDA\x1\xFFFF\x1\xDB\x1\xFFFF\x1\xBB"+
+			"\x5\x1E\x8\xFFFF\x2\x1E\x1\xEB\x2\x1E\x2\xFFFF\x1\xEF\x2\xFFFF\x3\x1E"+
+			"\x1\xF3\x1\x1E\x7\xFFFF\x2\x1E\x1\xFD\x1\xFFFF\x1\xFE\x1\xFF\x1\x100"+
+			"\x1\xFFFF\x1\x101\x1\x102\x1\x1E\x1\xFFFF\x1\x1E\x6\xFFFF\x2\x1E\x6\xFFFF"+
+			"\x1\x10C\x6\xFFFF\x2\x1E\x3\xFFFF\x1\x112\x1\x1E\x2\xFFFF\x1\x115\x4"+
+			"\xFFFF";
 		private const string DFA34_eofS =
-			"\x102\xFFFF";
+			"\x118\xFFFF";
 		private const string DFA34_minS =
-			"\x1\x9\x7\xFFFF\x1\x6E\x3\x65\x1\x72\x1\x6C\x1\x61\x1\x41\x1\x65\x1\x6F"+
-			"\x1\x65\x1\x61\x2\x6F\x1\x30\x1\x2E\x1\x61\x1\x2E\x5\xFFFF\x1\x30\x1"+
-			"\x64\x1\x30\x1\x6E\x1\x6C\x2\x30\x1\x69\x3\x30\x1\x64\x1\x63\x1\x6C\x1"+
-			"\x65\x1\x73\x1\x74\x6\x30\x1\xFFFF\x1\x61\x1\x62\x1\x63\x1\x6C\x1\x75"+
-			"\x1\x61\x2\x6E\x1\x78\x2\x75\x3\xFFFF\x1\x30\x1\x6C\x1\xFFFF\x1\x73\x1"+
-			"\xFFFF\x1\x30\x1\x65\x1\x6C\x2\xFFFF\x1\x64\x3\xFFFF\x4\x30\x1\x72\x1"+
-			"\x63\x1\x30\x1\x65\x7\x30\x1\x72\x1\x73\x1\x30\x2\x6F\x1\x70\x1\x65\x1"+
-			"\x72\x1\x74\x2\x30\x1\x72\x1\x6E\x1\x30\x1\x73\x1\x77\x1\xFFFF\x2\x30"+
-			"\x1\x27\x3\xFFFF\x1\x61\x1\xFFFF\x1\x61\x2\x30\x1\xFFFF\x1\x74\x7\x30"+
-			"\x2\x74\x1\xFFFF\x1\x6E\x1\x77\x1\x70\x2\x30\x1\x68\x1\x74\x2\xFFFF\x1"+
-			"\x30\x1\x74\x3\xFFFF\x1\x65\x1\x69\x3\xFFFF\x2\x67\x2\xFFFF\x1\x69\x2"+
-			"\x30\x1\xFFFF\x4\x30\x1\x73\x1\x72\x1\x64\x2\x65\x1\xFFFF\x1\x30\x1\xFFFF"+
-			"\x1\x30\x1\x65\x1\x30\x1\xFFFF\x2\x30\x1\x74\x2\x65\x1\x6D\x1\xFFFF\x1"+
-			"\x30\x1\xFFFF\x4\x30\x1\x77\x1\x69\x1\x30\x2\x72\x2\xFFFF\x1\x30\x2\xFFFF"+
-			"\x1\x68\x1\x73\x1\x30\x1\x65\x1\xFFFF\x5\x30\x1\x69\x1\x6E\x1\x30\x1"+
-			"\xFFFF\x3\x30\x1\xFFFF\x2\x30\x1\xFFFF\x1\x27\x2\xFFFF\x2\x30\x1\xFFFF"+
-			"\x1\x74\x1\x67\xA\xFFFF\x1\x30\x1\xFFFF\x1\x68\x1\x6F\x1\xFFFF\x2\x30"+
-			"\x1\x66\x1\x30\x1\xFFFF\x2\x30\x3\xFFFF";
+			"\x1\x9\x7\xFFFF\x1\x6E\x3\x65\x1\x72\x1\x67\x1\x61\x1\x41\x1\x65\x1\x6F"+
+			"\x1\x65\x1\x61\x2\x6F\x1\x69\x1\x30\x1\x2E\x1\x61\x1\x2E\x5\xFFFF\x1"+
+			"\x30\x1\x64\x1\x30\x1\x6E\x1\x6C\x2\x30\x1\x69\x3\x30\x1\x64\x1\x30\x1"+
+			"\x6C\x1\x67\x1\x65\x1\x73\x1\x74\x7\x30\x1\xFFFF\x1\x61\x1\x62\x1\x63"+
+			"\x1\x6C\x1\x75\x1\x61\x2\x6E\x1\x78\x2\x75\x1\x74\x3\xFFFF\x1\x30\x1"+
+			"\x6C\x1\xFFFF\x1\x73\x1\xFFFF\x1\x30\x1\x65\x1\x6C\x2\xFFFF\x1\x64\x3"+
+			"\xFFFF\x3\x30\x1\xFFFF\x1\x30\x2\x72\x1\x63\x1\x30\x1\x65\x8\x30\x1\x72"+
+			"\x1\x73\x1\x30\x2\x6F\x1\x70\x1\x65\x1\x72\x1\x74\x2\x30\x1\x72\x1\x6E"+
+			"\x1\x68\x1\x30\x1\x73\x1\x77\x1\xFFFF\x2\x30\x1\x27\x3\xFFFF\x1\x61\x1"+
+			"\xFFFF\x1\x65\x1\x61\x2\x30\x1\xFFFF\x1\x74\x8\x30\x2\x74\x1\xFFFF\x1"+
+			"\x6E\x1\x77\x1\x70\x2\x30\x1\x68\x1\x74\x2\xFFFF\x1\x30\x1\x74\x1\x30"+
+			"\x3\xFFFF\x1\x65\x1\x69\x3\xFFFF\x3\x67\x2\xFFFF\x1\x69\x2\x30\x1\xFFFF"+
+			"\x5\x30\x1\x73\x1\x72\x1\x64\x2\x65\x1\xFFFF\x1\x30\x1\xFFFF\x1\x30\x1"+
+			"\x65\x1\x30\x1\xFFFF\x1\x30\x1\xFFFF\x1\x30\x1\x74\x1\x65\x1\x61\x1\x65"+
+			"\x1\x6D\x1\xFFFF\x1\x30\x1\xFFFF\x5\x30\x1\x77\x1\x69\x1\x30\x2\x72\x2"+
+			"\xFFFF\x1\x30\x2\xFFFF\x1\x68\x1\x73\x1\x74\x1\x30\x1\x65\x1\xFFFF\x3"+
+			"\x30\x1\xFFFF\x2\x30\x1\x69\x1\x6E\x1\x30\x1\xFFFF\x3\x30\x1\xFFFF\x2"+
+			"\x30\x1\x65\x1\xFFFF\x1\x27\x2\xFFFF\x1\x30\x1\xFFFF\x1\x30\x1\xFFFF"+
+			"\x1\x74\x1\x67\x6\xFFFF\x1\x30\x4\xFFFF\x1\x30\x1\xFFFF\x1\x68\x1\x6F"+
+			"\x2\xFFFF\x2\x30\x1\x66\x1\x30\x1\xFFFF\x2\x30\x3\xFFFF";
 		private const string DFA34_maxS =
 			"\x1\x7A\x7\xFFFF\x1\x71\x2\x75\x1\x74\x1\x72\x1\x76\x1\x65\x1\x7A\x1"+
-			"\x75\x1\x72\x1\x65\x3\x6F\x1\x39\x1\x78\x1\x61\x1\x4C\x5\xFFFF\x1\x7A"+
-			"\x1\x64\x1\x7A\x1\x74\x1\x6C\x2\x7A\x1\x69\x3\x7A\x1\x79\x1\x63\x1\x6C"+
-			"\x1\x65\x1\x73\x1\x79\x6\x7A\x1\xFFFF\x1\x61\x1\x6D\x1\x63\x2\x75\x1"+
-			"\x61\x2\x6E\x1\x78\x2\x75\x3\xFFFF\x1\x39\x1\x6C\x1\xFFFF\x1\x73\x1\xFFFF"+
-			"\x1\x7A\x1\x65\x1\x6C\x2\xFFFF\x1\x64\x3\xFFFF\x4\x7A\x1\x72\x1\x63\x1"+
-			"\x7A\x1\x65\x7\x7A\x1\x72\x1\x73\x1\x7A\x2\x6F\x1\x70\x1\x65\x1\x72\x1"+
-			"\x74\x2\x7A\x1\x72\x1\x6E\x1\x6D\x1\x73\x1\x77\x1\xFFFF\x2\x7A\x1\x27"+
-			"\x3\xFFFF\x1\x61\x1\xFFFF\x1\x61\x2\x7A\x1\xFFFF\x1\x74\x7\x7A\x2\x74"+
-			"\x1\xFFFF\x1\x6E\x1\x77\x1\x70\x2\x7A\x1\x68\x1\x74\x2\xFFFF\x1\x7A\x1"+
-			"\x74\x3\xFFFF\x1\x65\x1\x69\x3\xFFFF\x2\x67\x2\xFFFF\x1\x69\x2\x7A\x1"+
-			"\xFFFF\x4\x7A\x1\x73\x1\x72\x1\x64\x2\x65\x1\xFFFF\x1\x7A\x1\xFFFF\x1"+
-			"\x7A\x1\x65\x1\x7A\x1\xFFFF\x2\x7A\x1\x74\x2\x65\x1\x6D\x1\xFFFF\x1\x7A"+
-			"\x1\xFFFF\x4\x7A\x1\x77\x1\x69\x1\x7A\x2\x72\x2\xFFFF\x1\x7A\x2\xFFFF"+
-			"\x1\x68\x1\x73\x1\x7A\x1\x65\x1\xFFFF\x5\x7A\x1\x69\x1\x6E\x1\x7A\x1"+
-			"\xFFFF\x3\x7A\x1\xFFFF\x2\x7A\x1\xFFFF\x1\x27\x2\xFFFF\x2\x7A\x1\xFFFF"+
-			"\x1\x74\x1\x67\xA\xFFFF\x1\x7A\x1\xFFFF\x1\x68\x1\x6F\x1\xFFFF\x2\x7A"+
-			"\x1\x66\x1\x7A\x1\xFFFF\x2\x7A\x3\xFFFF";
+			"\x75\x1\x72\x1\x65\x3\x6F\x1\x69\x1\x39\x1\x78\x1\x61\x1\x4C\x5\xFFFF"+
+			"\x1\x7A\x1\x64\x1\x7A\x1\x74\x1\x6C\x2\x7A\x1\x69\x3\x7A\x1\x79\x1\x7A"+
+			"\x1\x6C\x1\x67\x1\x65\x1\x73\x1\x79\x7\x7A\x1\xFFFF\x1\x61\x1\x6D\x1"+
+			"\x63\x2\x75\x1\x61\x2\x6E\x1\x78\x2\x75\x1\x74\x3\xFFFF\x1\x39\x1\x6C"+
+			"\x1\xFFFF\x1\x73\x1\xFFFF\x1\x7A\x1\x65\x1\x6C\x2\xFFFF\x1\x64\x3\xFFFF"+
+			"\x3\x7A\x1\xFFFF\x1\x7A\x2\x72\x1\x63\x1\x7A\x1\x65\x8\x7A\x1\x72\x1"+
+			"\x73\x1\x7A\x2\x6F\x1\x70\x1\x65\x1\x72\x1\x74\x2\x7A\x1\x72\x1\x6E\x1"+
+			"\x68\x1\x6D\x1\x73\x1\x77\x1\xFFFF\x2\x7A\x1\x27\x3\xFFFF\x1\x61\x1\xFFFF"+
+			"\x1\x65\x1\x61\x2\x7A\x1\xFFFF\x1\x74\x8\x7A\x2\x74\x1\xFFFF\x1\x6E\x1"+
+			"\x77\x1\x70\x2\x7A\x1\x68\x1\x74\x2\xFFFF\x1\x7A\x1\x74\x1\x7A\x3\xFFFF"+
+			"\x1\x65\x1\x69\x3\xFFFF\x3\x67\x2\xFFFF\x1\x69\x2\x7A\x1\xFFFF\x5\x7A"+
+			"\x1\x73\x1\x72\x1\x64\x2\x65\x1\xFFFF\x1\x7A\x1\xFFFF\x1\x7A\x1\x65\x1"+
+			"\x7A\x1\xFFFF\x1\x7A\x1\xFFFF\x1\x7A\x1\x74\x1\x65\x1\x61\x1\x65\x1\x6D"+
+			"\x1\xFFFF\x1\x7A\x1\xFFFF\x5\x7A\x1\x77\x1\x69\x1\x7A\x2\x72\x2\xFFFF"+
+			"\x1\x7A\x2\xFFFF\x1\x68\x1\x73\x1\x74\x1\x7A\x1\x65\x1\xFFFF\x3\x7A\x1"+
+			"\xFFFF\x2\x7A\x1\x69\x1\x6E\x1\x7A\x1\xFFFF\x3\x7A\x1\xFFFF\x2\x7A\x1"+
+			"\x65\x1\xFFFF\x1\x27\x2\xFFFF\x1\x7A\x1\xFFFF\x1\x7A\x1\xFFFF\x1\x74"+
+			"\x1\x67\x6\xFFFF\x1\x7A\x4\xFFFF\x1\x7A\x1\xFFFF\x1\x68\x1\x6F\x2\xFFFF"+
+			"\x2\x7A\x1\x66\x1\x7A\x1\xFFFF\x2\x7A\x3\xFFFF";
 		private const string DFA34_acceptS =
-			"\x1\xFFFF\x1\x1\x1\x2\x1\x3\x1\x4\x1\x5\x1\x6\x1\x7\x12\xFFFF\x1\x3E"+
-			"\x1\x3F\x1\x40\x1\x41\x1\x42\x17\xFFFF\x1\x1C\xB\xFFFF\x1\x3D\x1\x34"+
-			"\x1\x35\x2\xFFFF\x1\x8\x1\xFFFF\x1\x9\x3\xFFFF\x1\xA\x1\xB\x1\xFFFF\x1"+
-			"\xC\x1\xD\x1\xF\x1F\xFFFF\x1\xE\x3\xFFFF\x1\x10\x1\x2D\x1\x11\x1\xFFFF"+
-			"\x1\x2E\x3\xFFFF\x1\x25\xA\xFFFF\x1\x32\x7\xFFFF\x1\x30\x1\x31\x2\xFFFF"+
-			"\x1\x36\x1\x37\x1\x38\x2\xFFFF\x1\x14\x1\x3A\x1\x3C\x2\xFFFF\x1\x12\x1"+
-			"\x26\x3\xFFFF\x1\x16\x9\xFFFF\x1\x39\x1\xFFFF\x1\x22\x3\xFFFF\x1\x27"+
-			"\x6\xFFFF\x1\x15\x1\xFFFF\x1\x16\x9\xFFFF\x1\x23\x1\x24\x1\xFFFF\x1\x28"+
-			"\x1\x2F\x4\xFFFF\x1\x15\x8\xFFFF\x1\x2B\x3\xFFFF\x1\x29\x2\xFFFF\x1\x33"+
-			"\x1\xFFFF\x1\x19\x1\x17\x2\xFFFF\x1\x1B\x2\xFFFF\x1\x2C\x1\x20\x1\x21"+
-			"\x1\x2A\x1\x1E\x1\x13\x1\x3B\x1\x19\x1\x17\x1\x18\x1\xFFFF\x1\x1B\x2"+
-			"\xFFFF\x1\x18\x4\xFFFF\x1\x1D\x2\xFFFF\x1\x1F\x2\x1A";
+			"\x1\xFFFF\x1\x1\x1\x2\x1\x3\x1\x4\x1\x5\x1\x6\x1\x7\x13\xFFFF\x1\x42"+
+			"\x1\x43\x1\x44\x1\x45\x1\x46\x19\xFFFF\x1\x1E\xC\xFFFF\x1\x41\x1\x38"+
+			"\x1\x39\x2\xFFFF\x1\x8\x1\xFFFF\x1\x9\x3\xFFFF\x1\xA\x1\xB\x1\xFFFF\x1"+
+			"\xC\x1\xD\x1\xF\x3\xFFFF\x1\x36\x1F\xFFFF\x1\xE\x3\xFFFF\x1\x10\x1\x2F"+
+			"\x1\x11\x1\xFFFF\x1\x30\x4\xFFFF\x1\x27\xB\xFFFF\x1\x34\x7\xFFFF\x1\x32"+
+			"\x1\x33\x3\xFFFF\x1\x3A\x1\x3B\x1\x3C\x2\xFFFF\x1\x14\x1\x3E\x1\x40\x3"+
+			"\xFFFF\x1\x12\x1\x28\x3\xFFFF\x1\x16\xA\xFFFF\x1\x3D\x1\xFFFF\x1\x24"+
+			"\x3\xFFFF\x1\x29\x1\xFFFF\x1\x37\x6\xFFFF\x1\x15\x1\xFFFF\x1\x16\xA\xFFFF"+
+			"\x1\x25\x1\x26\x1\xFFFF\x1\x2A\x1\x31\x5\xFFFF\x1\x15\x3\xFFFF\x1\x1A"+
+			"\x5\xFFFF\x1\x2D\x3\xFFFF\x1\x2B\x3\xFFFF\x1\x35\x1\xFFFF\x1\x19\x1\x17"+
+			"\x1\xFFFF\x1\x1A\x1\xFFFF\x1\x1D\x2\xFFFF\x1\x2E\x1\x22\x1\x23\x1\x2C"+
+			"\x1\x20\x1\x13\x1\xFFFF\x1\x3F\x1\x19\x1\x17\x1\x18\x1\xFFFF\x1\x1D\x2"+
+			"\xFFFF\x1\x1B\x1\x18\x4\xFFFF\x1\x1F\x2\xFFFF\x1\x21\x2\x1C";
 		private const string DFA34_specialS =
-			"\x102\xFFFF}>";
+			"\x118\xFFFF}>";
 		private static readonly string[] DFA34_transitionS =
 			{
-				"\x1\x1A\x1\x1B\x2\xFFFF\x1\x1B\x12\xFFFF\x1\x1A\x3\xFFFF\x1\xF\x1\xFFFF"+
-				"\x1\x1\x1\x1E\x1\x2\x1\x3\x2\xFFFF\x1\x4\x1\x16\x1\xFFFF\x1\x5\x1\x17"+
-				"\x9\x19\x1\x6\x2\xFFFF\x1\x7\x3\xFFFF\x1A\x1D\x1\x1C\x5\xFFFF\x1\xD"+
-				"\x1\x1D\x1\x15\x1\xE\x1\x8\x1\x18\x1\xA\x1\x14\x3\x1D\x1\xB\x1\x13\x1"+
-				"\x9\x1\xC\x3\x1D\x1\x10\x1\x11\x4\x1D\x1\x12\x1\x1D",
+				"\x1\x1B\x1\x1C\x2\xFFFF\x1\x1C\x12\xFFFF\x1\x1B\x3\xFFFF\x1\xF\x1\xFFFF"+
+				"\x1\x1\x1\x1F\x1\x2\x1\x3\x2\xFFFF\x1\x4\x1\x17\x1\xFFFF\x1\x5\x1\x18"+
+				"\x9\x1A\x1\x6\x2\xFFFF\x1\x7\x3\xFFFF\x1A\x1E\x1\x1D\x5\xFFFF\x1\xD"+
+				"\x1\x1E\x1\x15\x1\xE\x1\x8\x1\x19\x1\xA\x1\x14\x3\x1E\x1\xB\x1\x13\x1"+
+				"\x9\x1\xC\x3\x1E\x1\x10\x1\x11\x2\x1E\x1\x16\x1\x1E\x1\x12\x1\x1E",
 				"",
 				"",
 				"",
@@ -4918,302 +5108,331 @@ private class DFA34 : DFA
 				"",
 				"",
 				"",
-				"\x1\x20\x2\xFFFF\x1\x1F",
-				"\x1\x21\x9\xFFFF\x1\x22\x5\xFFFF\x1\x23",
-				"\x1\x25\xE\xFFFF\x1\x24\x1\x26",
-				"\x1\x28\xE\xFFFF\x1\x27",
-				"\x1\x29",
-				"\x1\x2C\x1\xFFFF\x1\x2A\x4\xFFFF\x1\x2B\x2\xFFFF\x1\x2D",
-				"\x1\x2F\x3\xFFFF\x1\x2E",
-				"\x1A\x36\x6\xFFFF\x4\x36\x1\x35\x1\x32\x2\x36\x1\x34\x5\x36\x1\x33\x3"+
-				"\x36\x1\x30\x1\x31\x6\x36",
-				"\x1\x39\xE\xFFFF\x1\x37\x1\x38",
-				"\x1\x3A\x2\xFFFF\x1\x3B",
-				"\x1\x3C",
-				"\x1\x3F\x7\xFFFF\x1\x3E\x5\xFFFF\x1\x3D",
-				"\x1\x40",
-				"\x1\x41",
-				"\xA\x19",
-				"\x1\x45\x1\xFFFF\xA\x19\x12\xFFFF\x1\x44\x2B\xFFFF\x1\x42",
-				"\x1\x46",
-				"\x1\x45\x1\xFFFF\xA\x19\x12\xFFFF\x1\x44",
+				"\x1\x21\x2\xFFFF\x1\x20",
+				"\x1\x22\x9\xFFFF\x1\x23\x5\xFFFF\x1\x24",
+				"\x1\x26\xE\xFFFF\x1\x25\x1\x27",
+				"\x1\x29\xE\xFFFF\x1\x28",
+				"\x1\x2A",
+				"\x1\x2E\x4\xFFFF\x1\x2D\x1\xFFFF\x1\x2B\x4\xFFFF\x1\x2C\x2\xFFFF\x1"+
+				"\x2F",
+				"\x1\x31\x3\xFFFF\x1\x30",
+				"\x1A\x39\x6\xFFFF\x1\x36\x3\x39\x1\x38\x1\x34\x2\x39\x1\x37\x5\x39\x1"+
+				"\x35\x3\x39\x1\x32\x1\x33\x6\x39",
+				"\x1\x3C\xE\xFFFF\x1\x3A\x1\x3B",
+				"\x1\x3D\x2\xFFFF\x1\x3E",
+				"\x1\x3F",
+				"\x1\x42\x7\xFFFF\x1\x41\x5\xFFFF\x1\x40",
+				"\x1\x43",
+				"\x1\x44",
+				"\x1\x45",
+				"\xA\x1A",
+				"\x1\x49\x1\xFFFF\xA\x1A\x12\xFFFF\x1\x48\x2B\xFFFF\x1\x46",
+				"\x1\x4A",
+				"\x1\x49\x1\xFFFF\xA\x1A\x12\xFFFF\x1\x48",
 				"",
 				"",
 				"",
 				"",
 				"",
-				"\xA\x1D\x7\xFFFF\x1A\x1D\x4\xFFFF\x1\x1D\x1\xFFFF\x1A\x1D",
-				"\x1\x48",
-				"\xA\x1D\x7\xFFFF\x1A\x1D\x4\xFFFF\x1\x1D\x1\xFFFF\x1A\x1D",
-				"\x1\x4B\x5\xFFFF\x1\x4A",
+				"\xA\x1E\x7\xFFFF\x1A\x1E\x4\xFFFF\x1\x1E\x1\xFFFF\x1A\x1E",
 				"\x1\x4C",
-				"\xA\x1D\x7\xFFFF\x1A\x1D\x4\xFFFF\x1\x1D\x1\xFFFF\x1A\x1D",
-				"\xA\x1D\x7\xFFFF\x1A\x1D\x4\xFFFF\x1\x1D\x1\xFFFF\x1A\x1D",
-				"\x1\x4F",
-				"\xA\x1D\x7\xFFFF\x1A\x1D\x4\xFFFF\x1\x1D\x1\xFFFF\x1A\x1D",
-				"\xA\x1D\x7\xFFFF\x1A\x1D\x4\xFFFF\x1\x1D\x1\xFFFF\x1A\x1D",
-				"\xA\x1D\x7\xFFFF\x1A\x1D\x4\xFFFF\x1\x1D\x1\xFFFF\x1A\x1D",
-				"\x1\x53\x14\xFFFF\x1\x54",
-				"\x1\x55",
-				"\x1\x56",
-				"\x1\x57",
-				"\x1\x58",
-				"\x1\x5A\x4\xFFFF\x1\x59",
-				"\xA\x36\x3\xFFFF\x1\x36\x3\xFFFF\x1A\x36\x4\xFFFF\x1\x36\x1\xFFFF\x4"+
-				"\x36\x1\x5C\x5\x36\x1\x5B\xF\x36",
-				"\xA\x36\x3\xFFFF\x1\x36\x3\xFFFF\x1A\x36\x4\xFFFF\x1\x36\x1\xFFFF\xE"+
-				"\x36\x1\x5D\xB\x36",
-				"\xA\x36\x3\xFFFF\x1\x36\x3\xFFFF\x1A\x36\x4\xFFFF\x1\x36\x1\xFFFF\x8"+
-				"\x36\x1\x5E\x11\x36",
-				"\xA\x36\x3\xFFFF\x1\x36\x3\xFFFF\x1A\x36\x4\xFFFF\x1\x36\x1\xFFFF\x11"+
-				"\x36\x1\x5F\x8\x36",
-				"\xA\x36\x3\xFFFF\x1\x36\x3\xFFFF\x1A\x36\x4\xFFFF\x1\x36\x1\xFFFF\xD"+
-				"\x36\x1\x60\xC\x36",
-				"\xA\x36\x3\xFFFF\x1\x36\x3\xFFFF\x1A\x36\x4\xFFFF\x1\x36\x1\xFFFF\x17"+
-				"\x36\x1\x61\x2\x36",
+				"\xA\x1E\x7\xFFFF\x1A\x1E\x4\xFFFF\x1\x1E\x1\xFFFF\x1A\x1E",
+				"\x1\x4F\x5\xFFFF\x1\x4E",
+				"\x1\x50",
+				"\xA\x1E\x7\xFFFF\x1A\x1E\x4\xFFFF\x1\x1E\x1\xFFFF\x1A\x1E",
+				"\xA\x1E\x7\xFFFF\x1A\x1E\x4\xFFFF\x1\x1E\x1\xFFFF\x1A\x1E",
+				"\x1\x53",
+				"\xA\x1E\x7\xFFFF\x1A\x1E\x4\xFFFF\x1\x1E\x1\xFFFF\x1A\x1E",
+				"\xA\x1E\x7\xFFFF\x1A\x1E\x4\xFFFF\x1\x1E\x1\xFFFF\x1A\x1E",
+				"\xA\x1E\x7\xFFFF\x1A\x1E\x4\xFFFF\x1\x1E\x1\xFFFF\x1A\x1E",
+				"\x1\x57\x14\xFFFF\x1\x58",
+				"\xA\x1E\x7\xFFFF\x1A\x1E\x4\xFFFF\x1\x1E\x1\xFFFF\x2\x1E\x1\x59\x17"+
+				"\x1E",
+				"\x1\x5B",
+				"\x1\x5C",
+				"\x1\x5D",
+				"\x1\x5E",
+				"\x1\x60\x4\xFFFF\x1\x5F",
+				"\xA\x39\x3\xFFFF\x1\x39\x3\xFFFF\x1A\x39\x4\xFFFF\x1\x39\x1\xFFFF\x4"+
+				"\x39\x1\x62\x5\x39\x1\x61\xF\x39",
+				"\xA\x39\x3\xFFFF\x1\x39\x3\xFFFF\x1A\x39\x4\xFFFF\x1\x39\x1\xFFFF\xE"+
+				"\x39\x1\x63\xB\x39",
+				"\xA\x39\x3\xFFFF\x1\x39\x3\xFFFF\x1A\x39\x4\xFFFF\x1\x39\x1\xFFFF\x8"+
+				"\x39\x1\x64\x11\x39",
+				"\xA\x39\x3\xFFFF\x1\x39\x3\xFFFF\x1A\x39\x4\xFFFF\x1\x39\x1\xFFFF\x11"+
+				"\x39\x1\x65\x8\x39",
+				"\xA\x39\x3\xFFFF\x1\x39\x3\xFFFF\x1A\x39\x4\xFFFF\x1\x39\x1\xFFFF\xF"+
+				"\x39\x1\x66\xA\x39",
+				"\xA\x39\x3\xFFFF\x1\x39\x3\xFFFF\x1A\x39\x4\xFFFF\x1\x39\x1\xFFFF\xD"+
+				"\x39\x1\x67\xC\x39",
+				"\xA\x39\x3\xFFFF\x1\x39\x3\xFFFF\x1A\x39\x4\xFFFF\x1\x39\x1\xFFFF\x17"+
+				"\x39\x1\x68\x2\x39",
 				"",
-				"\x1\x62",
-				"\x1\x63\xA\xFFFF\x1\x64",
-				"\x1\x65",
-				"\x1\x66\x8\xFFFF\x1\x67",
-				"\x1\x68",
 				"\x1\x69",
-				"\x1\x6A",
-				"\x1\x6B",
+				"\x1\x6A\xA\xFFFF\x1\x6B",
 				"\x1\x6C",
-				"\x1\x6D",
-				"\x1\x6E",
-				"",
-				"",
-				"",
-				"\xA\x6F",
+				"\x1\x6D\x8\xFFFF\x1\x6E",
+				"\x1\x6F",
 				"\x1\x70",
-				"",
 				"\x1\x71",
-				"",
-				"\xA\x1D\x7\xFFFF\x1A\x1D\x4\xFFFF\x1\x1D\x1\xFFFF\x1A\x1D",
+				"\x1\x72",
 				"\x1\x73",
 				"\x1\x74",
+				"\x1\x75",
+				"\x1\x76",
 				"",
 				"",
-				"\x1\x75",
 				"",
+				"\xA\x77",
+				"\x1\x78",
 				"",
+				"\x1\x79",
 				"",
-				"\xA\x1D\x7\xFFFF\x1A\x1D\x4\xFFFF\x1\x1D\x1\xFFFF\x1A\x1D",
-				"\xA\x1D\x7\xFFFF\x1A\x1D\x4\xFFFF\x1\x1D\x1\xFFFF\x1A\x1D",
-				"\xA\x1D\x7\xFFFF\x1A\x1D\x4\xFFFF\x1\x1D\x1\xFFFF\x1A\x1D",
-				"\xA\x1D\x7\xFFFF\x1A\x1D\x4\xFFFF\x1\x1D\x1\xFFFF\xF\x1D\x1\x79\xA\x1D",
+				"\xA\x1E\x7\xFFFF\x1A\x1E\x4\xFFFF\x1\x1E\x1\xFFFF\x1A\x1E",
 				"\x1\x7B",
 				"\x1\x7C",
-				"\xA\x1D\x7\xFFFF\x1A\x1D\x4\xFFFF\x1\x1D\x1\xFFFF\x12\x1D\x1\x7D\x7"+
-				"\x1D",
-				"\x1\x7F",
-				"\xA\x36\x3\xFFFF\x1\x36\x3\xFFFF\x1A\x36\x4\xFFFF\x1\x36\x1\xFFFF\x8"+
-				"\x36\x1\x80\x11\x36",
-				"\xA\x36\x3\xFFFF\x1\x36\x3\xFFFF\x1A\x36\x4\xFFFF\x1\x36\x1\xFFFF\xB"+
-				"\x36\x1\x81\xE\x36",
-				"\xA\x36\x3\xFFFF\x1\x36\x3\xFFFF\x1A\x36\x4\xFFFF\x1\x36\x1\xFFFF\xF"+
-				"\x36\x1\x82\xA\x36",
-				"\xA\x36\x3\xFFFF\x1\x36\x3\xFFFF\x1A\x36\x4\xFFFF\x1\x36\x1\xFFFF\xB"+
-				"\x36\x1\x83\xE\x36",
-				"\xA\x36\x3\xFFFF\x1\x36\x3\xFFFF\x1A\x36\x4\xFFFF\x1\x36\x1\xFFFF\x3"+
-				"\x36\x1\x84\x16\x36",
-				"\xA\x36\x3\xFFFF\x1\x36\x3\xFFFF\x1A\x36\x4\xFFFF\x1\x36\x1\xFFFF\xB"+
-				"\x36\x1\x85\xE\x36",
-				"\xA\x36\x3\xFFFF\x1\x36\x3\xFFFF\x1A\x36\x4\xFFFF\x1\x36\x1\xFFFF\xF"+
-				"\x36\x1\x86\xA\x36",
-				"\x1\x87",
+				"",
+				"",
+				"\x1\x7D",
+				"",
+				"",
+				"",
+				"\xA\x1E\x7\xFFFF\x1A\x1E\x4\xFFFF\x1\x1E\x1\xFFFF\x1A\x1E",
+				"\xA\x1E\x7\xFFFF\x1A\x1E\x4\xFFFF\x1\x1E\x1\xFFFF\x1A\x1E",
+				"\xA\x1E\x7\xFFFF\x1A\x1E\x4\xFFFF\x1\x1E\x1\xFFFF\x1A\x1E",
+				"",
+				"\xA\x1E\x7\xFFFF\x1A\x1E\x4\xFFFF\x1\x1E\x1\xFFFF\xF\x1E\x1\x81\xA\x1E",
+				"\x1\x83",
+				"\x1\x84",
+				"\x1\x85",
+				"\xA\x1E\x7\xFFFF\x1A\x1E\x4\xFFFF\x1\x1E\x1\xFFFF\x12\x1E\x1\x86\x7"+
+				"\x1E",
 				"\x1\x88",
-				"\xA\x1D\x7\xFFFF\x1A\x1D\x4\xFFFF\x1\x1D\x1\xFFFF\x1A\x1D",
-				"\x1\x8A",
-				"\x1\x8B",
-				"\x1\x8C",
-				"\x1\x8D",
-				"\x1\x8E",
-				"\x1\x8F",
-				"\xA\x1D\x7\xFFFF\x1A\x1D\x4\xFFFF\x1\x1D\x1\xFFFF\x14\x1D\x1\x90\x5"+
-				"\x1D",
-				"\xA\x1D\x7\xFFFF\x1A\x1D\x4\xFFFF\x1\x1D\x1\xFFFF\x1A\x1D",
-				"\x1\x93",
+				"\xA\x39\x3\xFFFF\x1\x39\x3\xFFFF\x1A\x39\x4\xFFFF\x1\x39\x1\xFFFF\x8"+
+				"\x39\x1\x89\x11\x39",
+				"\xA\x39\x3\xFFFF\x1\x39\x3\xFFFF\x1A\x39\x4\xFFFF\x1\x39\x1\xFFFF\xB"+
+				"\x39\x1\x8A\xE\x39",
+				"\xA\x39\x3\xFFFF\x1\x39\x3\xFFFF\x1A\x39\x4\xFFFF\x1\x39\x1\xFFFF\xF"+
+				"\x39\x1\x8B\xA\x39",
+				"\xA\x39\x3\xFFFF\x1\x39\x3\xFFFF\x1A\x39\x4\xFFFF\x1\x39\x1\xFFFF\xB"+
+				"\x39\x1\x8C\xE\x39",
+				"\xA\x39\x3\xFFFF\x1\x39\x3\xFFFF\x1A\x39\x4\xFFFF\x1\x39\x1\xFFFF\x3"+
+				"\x39\x1\x8D\x16\x39",
+				"\xA\x39\x3\xFFFF\x1\x39\x3\xFFFF\x1A\x39\x4\xFFFF\x1\x39\x1\xFFFF\xF"+
+				"\x39\x1\x8E\xA\x39",
+				"\xA\x39\x3\xFFFF\x1\x39\x3\xFFFF\x1A\x39\x4\xFFFF\x1\x39\x1\xFFFF\xB"+
+				"\x39\x1\x8F\xE\x39",
+				"\xA\x39\x3\xFFFF\x1\x39\x3\xFFFF\x1A\x39\x4\xFFFF\x1\x39\x1\xFFFF\xF"+
+				"\x39\x1\x90\xA\x39",
+				"\x1\x91",
+				"\x1\x92",
+				"\xA\x1E\x7\xFFFF\x1A\x1E\x4\xFFFF\x1\x1E\x1\xFFFF\x1A\x1E",
 				"\x1\x94",
-				"\xA\x6F\x2C\xFFFF\x1\x96\x6\xFFFF\x1\x97",
+				"\x1\x95",
+				"\x1\x96",
+				"\x1\x97",
 				"\x1\x98",
 				"\x1\x99",
+				"\xA\x1E\x7\xFFFF\x1A\x1E\x4\xFFFF\x1\x1E\x1\xFFFF\x14\x1E\x1\x9A\x5"+
+				"\x1E",
+				"\xA\x1E\x7\xFFFF\x1A\x1E\x4\xFFFF\x1\x1E\x1\xFFFF\x1A\x1E",
+				"\x1\x9D",
+				"\x1\x9E",
+				"\x1\x9F",
+				"\xA\x77\x2C\xFFFF\x1\xA1\x6\xFFFF\x1\xA2",
+				"\x1\xA3",
+				"\x1\xA4",
 				"",
-				"\xA\x1D\x7\xFFFF\x1A\x1D\x4\xFFFF\x1\x1D\x1\xFFFF\x1A\x1D",
-				"\xA\x1D\x7\xFFFF\x1A\x1D\x4\xFFFF\x1\x1D\x1\xFFFF\x1A\x1D",
-				"\x1\x9C",
+				"\xA\x1E\x7\xFFFF\x1A\x1E\x4\xFFFF\x1\x1E\x1\xFFFF\x1A\x1E",
+				"\xA\x1E\x7\xFFFF\x1A\x1E\x4\xFFFF\x1\x1E\x1\xFFFF\x1A\x1E",
+				"\x1\xA7",
 				"",
 				"",
 				"",
-				"\x1\x9D",
-				"",
-				"\x1\x9E",
-				"\xA\x1D\x7\xFFFF\x1A\x1D\x4\xFFFF\x1\x1D\x1\xFFFF\x1A\x1D",
-				"\xA\x1D\x7\xFFFF\x1A\x1D\x4\xFFFF\x1\x1D\x1\xFFFF\x1A\x1D",
+				"\x1\xA8",
 				"",
-				"\x1\xA1",
-				"\xA\x36\x3\xFFFF\x1\x36\x3\xFFFF\x1A\x36\x4\xFFFF\x1\x36\x1\xFFFF\xF"+
-				"\x36\x1\xA2\xA\x36",
-				"\xA\x36\x3\xFFFF\x1\x36\x3\xFFFF\x1A\x36\x4\xFFFF\x1\x36\x1\xFFFF\x4"+
-				"\x36\x1\xA3\x15\x36",
-				"\xA\x36\x3\xFFFF\x1\xA4\x3\xFFFF\x1A\x36\x4\xFFFF\x1\x36\x1\xFFFF\x1A"+
-				"\x36",
-				"\xA\x36\x3\xFFFF\x1\x36\x3\xFFFF\x1A\x36\x4\xFFFF\x1\x36\x1\xFFFF\x13"+
-				"\x36\x1\xA5\x6\x36",
-				"\xA\x36\x3\xFFFF\x1\x36\x3\xFFFF\x1A\x36\x4\xFFFF\x1\x36\x1\xFFFF\x4"+
-				"\x36\x1\xA6\x15\x36",
-				"\xA\x36\x3\xFFFF\x1\x36\x3\xFFFF\x1A\x36\x4\xFFFF\x1\x36\x1\xFFFF\x8"+
-				"\x36\x1\xA7\x11\x36",
-				"\xA\x36\x3\xFFFF\x1\x36\x3\xFFFF\x1A\x36\x4\xFFFF\x1\x36\x1\xFFFF\x1"+
-				"\xA8\x19\x36",
 				"\x1\xA9",
 				"\x1\xAA",
+				"\xA\x1E\x7\xFFFF\x1A\x1E\x4\xFFFF\x1\x1E\x1\xFFFF\x1A\x1E",
+				"\xA\x1E\x7\xFFFF\x1A\x1E\x4\xFFFF\x1\x1E\x1\xFFFF\x1A\x1E",
 				"",
-				"\x1\xAB",
-				"\x1\xAC",
 				"\x1\xAD",
-				"\xA\x1D\x7\xFFFF\x1A\x1D\x4\xFFFF\x1\x1D\x1\xFFFF\x1A\x1D",
-				"\xA\x1D\x7\xFFFF\x1A\x1D\x4\xFFFF\x1\x1D\x1\xFFFF\x12\x1D\x1\xAF\x7"+
-				"\x1D",
-				"\x1\xB1",
-				"\x1\xB2",
-				"",
-				"",
-				"\xA\x1D\x7\xFFFF\x1A\x1D\x4\xFFFF\x1\x1D\x1\xFFFF\x12\x1D\x1\xB3\x7"+
-				"\x1D",
-				"\x1\xB5",
-				"",
-				"",
-				"",
+				"\xA\x39\x3\xFFFF\x1\x39\x3\xFFFF\x1A\x39\x4\xFFFF\x1\x39\x1\xFFFF\xF"+
+				"\x39\x1\xAE\xA\x39",
+				"\xA\x39\x3\xFFFF\x1\x39\x3\xFFFF\x1A\x39\x4\xFFFF\x1\x39\x1\xFFFF\x4"+
+				"\x39\x1\xAF\x15\x39",
+				"\xA\x39\x3\xFFFF\x1\xB0\x3\xFFFF\x1A\x39\x4\xFFFF\x1\x39\x1\xFFFF\x1A"+
+				"\x39",
+				"\xA\x39\x3\xFFFF\x1\x39\x3\xFFFF\x1A\x39\x4\xFFFF\x1\x39\x1\xFFFF\x13"+
+				"\x39\x1\xB1\x6\x39",
+				"\xA\x39\x3\xFFFF\x1\x39\x3\xFFFF\x1A\x39\x4\xFFFF\x1\x39\x1\xFFFF\x4"+
+				"\x39\x1\xB2\x15\x39",
+				"\xA\x39\x3\xFFFF\x1\x39\x3\xFFFF\x1A\x39\x4\xFFFF\x1\x39\x1\xFFFF\xB"+
+				"\x39\x1\xB3\xE\x39",
+				"\xA\x39\x3\xFFFF\x1\x39\x3\xFFFF\x1A\x39\x4\xFFFF\x1\x39\x1\xFFFF\x8"+
+				"\x39\x1\xB4\x11\x39",
+				"\xA\x39\x3\xFFFF\x1\x39\x3\xFFFF\x1A\x39\x4\xFFFF\x1\x39\x1\xFFFF\x1"+
+				"\xB5\x19\x39",
 				"\x1\xB6",
 				"\x1\xB7",
 				"",
-				"",
-				"",
 				"\x1\xB8",
 				"\x1\xB9",
-				"",
-				"",
 				"\x1\xBA",
-				"\xA\x36\x3\xFFFF\x1\xBB\x3\xFFFF\x1A\x36\x4\xFFFF\x1\x36\x1\xFFFF\x1A"+
-				"\x36",
-				"\xA\x36\x3\xFFFF\x1\x36\x3\xFFFF\x1A\x36\x4\xFFFF\x1\x36\x1\xFFFF\x2"+
-				"\x36\x1\xBC\x17\x36",
+				"\xA\x1E\x7\xFFFF\x1A\x1E\x4\xFFFF\x1\x1E\x1\xFFFF\x1A\x1E",
+				"\xA\x1E\x7\xFFFF\x1A\x1E\x4\xFFFF\x1\x1E\x1\xFFFF\x12\x1E\x1\xBC\x7"+
+				"\x1E",
+				"\x1\xBE",
+				"\x1\xBF",
 				"",
-				"\xA\x36\x3\xFFFF\x1\x36\x3\xFFFF\x1A\x36\x4\xFFFF\x1\x36\x1\xFFFF\x4"+
-				"\x36\x1\xBE\x15\x36",
-				"\xA\x36\x3\xFFFF\x1\x36\x3\xFFFF\x1A\x36\x4\xFFFF\x1\x36\x1\xFFFF\x11"+
-				"\x36\x1\xBF\x8\x36",
-				"\xA\x36\x3\xFFFF\x1\x36\x3\xFFFF\x1A\x36\x4\xFFFF\x1\x36\x1\xFFFF\xD"+
-				"\x36\x1\xC0\xC\x36",
-				"\xA\x36\x3\xFFFF\x1\x36\x3\xFFFF\x1A\x36\x4\xFFFF\x1\x36\x1\xFFFF\xD"+
-				"\x36\x1\xC1\xC\x36",
+				"",
+				"\xA\x1E\x7\xFFFF\x1A\x1E\x4\xFFFF\x1\x1E\x1\xFFFF\x12\x1E\x1\xC0\x7"+
+				"\x1E",
 				"\x1\xC2",
-				"\x1\xC3",
+				"\xA\x1E\x7\xFFFF\x1A\x1E\x4\xFFFF\x1\x1E\x1\xFFFF\x1A\x1E",
+				"",
+				"",
+				"",
 				"\x1\xC4",
 				"\x1\xC5",
-				"\x1\xC6",
 				"",
-				"\xA\x1D\x7\xFFFF\x1A\x1D\x4\xFFFF\x1\x1D\x1\xFFFF\x1A\x1D",
 				"",
-				"\xA\x1D\x7\xFFFF\x1A\x1D\x4\xFFFF\x1\x1D\x1\xFFFF\x1A\x1D",
-				"\x1\xC9",
-				"\xA\x1D\x7\xFFFF\x1A\x1D\x4\xFFFF\x1\x1D\x1\xFFFF\x1A\x1D",
 				"",
-				"\xA\x1D\x7\xFFFF\x1A\x1D\x4\xFFFF\x1\x1D\x1\xFFFF\x1A\x1D",
-				"\xA\x1D\x7\xFFFF\x1A\x1D\x4\xFFFF\x1\x1D\x1\xFFFF\x1A\x1D",
-				"\x1\xCC",
-				"\x1\xCD",
-				"\x1\xCE",
-				"\x1\xCF",
+				"\x1\xC6",
+				"\x1\xC7",
+				"\x1\xC8",
+				"",
 				"",
-				"\xA\x36\x3\xFFFF\x1\x36\x3\xFFFF\x1A\x36\x4\xFFFF\x1\x36\x1\xFFFF\x13"+
-				"\x36\x1\xD1\x6\x36",
+				"\x1\xC9",
+				"\xA\x39\x3\xFFFF\x1\xCA\x3\xFFFF\x1A\x39\x4\xFFFF\x1\x39\x1\xFFFF\x1A"+
+				"\x39",
+				"\xA\x39\x3\xFFFF\x1\x39\x3\xFFFF\x1A\x39\x4\xFFFF\x1\x39\x1\xFFFF\x2"+
+				"\x39\x1\xCB\x17\x39",
 				"",
-				"\xA\x36\x3\xFFFF\x1\x36\x3\xFFFF\x1A\x36\x4\xFFFF\x1\x36\x1\xFFFF\x11"+
-				"\x36\x1\xD2\x8\x36",
-				"\xA\x36\x3\xFFFF\x1\x36\x3\xFFFF\x1A\x36\x4\xFFFF\x1\x36\x1\xFFFF\x1"+
-				"\x36\x1\xD3\x18\x36",
-				"\xA\x36\x3\xFFFF\x1\x36\x3\xFFFF\x1A\x36\x4\xFFFF\x1\x36\x1\xFFFF\x4"+
-				"\x36\x1\xD4\x15\x36",
-				"\xA\x36\x3\xFFFF\x1\x36\x3\xFFFF\x1A\x36\x4\xFFFF\x1\x36\x1\xFFFF\x3"+
-				"\x36\x1\xD5\x16\x36",
+				"\xA\x39\x3\xFFFF\x1\x39\x3\xFFFF\x1A\x39\x4\xFFFF\x1\x39\x1\xFFFF\x4"+
+				"\x39\x1\xCD\x15\x39",
+				"\xA\x39\x3\xFFFF\x1\x39\x3\xFFFF\x1A\x39\x4\xFFFF\x1\x39\x1\xFFFF\x11"+
+				"\x39\x1\xCE\x8\x39",
+				"\xA\x39\x3\xFFFF\x1\x39\x3\xFFFF\x1A\x39\x4\xFFFF\x1\x39\x1\xFFFF\x18"+
+				"\x39\x1\xCF\x1\x39",
+				"\xA\x39\x3\xFFFF\x1\x39\x3\xFFFF\x1A\x39\x4\xFFFF\x1\x39\x1\xFFFF\xD"+
+				"\x39\x1\xD0\xC\x39",
+				"\xA\x39\x3\xFFFF\x1\x39\x3\xFFFF\x1A\x39\x4\xFFFF\x1\x39\x1\xFFFF\xD"+
+				"\x39\x1\xD1\xC\x39",
+				"\x1\xD2",
+				"\x1\xD3",
+				"\x1\xD4",
+				"\x1\xD5",
 				"\x1\xD6",
-				"\x1\xD7",
-				"\xA\x1D\x7\xFFFF\x1A\x1D\x4\xFFFF\x1\x1D\x1\xFFFF\x12\x1D\x1\xD8\x7"+
-				"\x1D",
-				"\x1\xDA",
-				"\x1\xDB",
 				"",
+				"\xA\x1E\x7\xFFFF\x1A\x1E\x4\xFFFF\x1\x1E\x1\xFFFF\x1A\x1E",
 				"",
-				"\xA\x1D\x7\xFFFF\x1A\x1D\x4\xFFFF\x1\x1D\x1\xFFFF\x12\x1D\x1\xDC\x7"+
-				"\x1D",
+				"\xA\x1E\x7\xFFFF\x1A\x1E\x4\xFFFF\x1\x1E\x1\xFFFF\x1A\x1E",
+				"\x1\xD9",
+				"\xA\x1E\x7\xFFFF\x1A\x1E\x4\xFFFF\x1\x1E\x1\xFFFF\x1A\x1E",
 				"",
+				"\xA\x1E\x7\xFFFF\x1A\x1E\x4\xFFFF\x1\x1E\x1\xFFFF\x1A\x1E",
 				"",
+				"\xA\x1E\x7\xFFFF\x1A\x1E\x4\xFFFF\x1\x1E\x1\xFFFF\x1A\x1E",
+				"\x1\xDC",
+				"\x1\xDD",
 				"\x1\xDE",
 				"\x1\xDF",
-				"\xA\x1D\x7\xFFFF\x1A\x1D\x4\xFFFF\x1\x1D\x1\xFFFF\x1A\x1D",
-				"\x1\xE1",
+				"\x1\xE0",
 				"",
-				"\xA\x36\x3\xFFFF\x1\xE2\x3\xFFFF\x1A\x36\x4\xFFFF\x1\x36\x1\xFFFF\x1A"+
-				"\x36",
-				"\xA\x36\x3\xFFFF\x1\xE3\x3\xFFFF\x1A\x36\x4\xFFFF\x1\x36\x1\xFFFF\x1A"+
-				"\x36",
-				"\xA\x36\x3\xFFFF\x1\x36\x3\xFFFF\x1A\x36\x4\xFFFF\x1\x36\x1\xFFFF\x18"+
-				"\x36\x1\xE4\x1\x36",
-				"\xA\x36\x3\xFFFF\x1\x36\x3\xFFFF\x1A\x36\x4\xFFFF\x1\x36\x1\xFFFF\x2"+
-				"\x36\x1\xE5\x17\x36",
-				"\xA\x36\x3\xFFFF\x1\xE6\x3\xFFFF\x1A\x36\x4\xFFFF\x1\x36\x1\xFFFF\x1A"+
-				"\x36",
-				"\x1\xE7",
+				"\xA\x39\x3\xFFFF\x1\x39\x3\xFFFF\x1A\x39\x4\xFFFF\x1\x39\x1\xFFFF\x13"+
+				"\x39\x1\xE2\x6\x39",
+				"",
+				"\xA\x39\x3\xFFFF\x1\x39\x3\xFFFF\x1A\x39\x4\xFFFF\x1\x39\x1\xFFFF\x11"+
+				"\x39\x1\xE3\x8\x39",
+				"\xA\x39\x3\xFFFF\x1\x39\x3\xFFFF\x1A\x39\x4\xFFFF\x1\x39\x1\xFFFF\x1"+
+				"\x39\x1\xE4\x18\x39",
+				"\xA\x39\x3\xFFFF\x1\xE5\x3\xFFFF\x1A\x39\x4\xFFFF\x1\x39\x1\xFFFF\x1A"+
+				"\x39",
+				"\xA\x39\x3\xFFFF\x1\x39\x3\xFFFF\x1A\x39\x4\xFFFF\x1\x39\x1\xFFFF\x4"+
+				"\x39\x1\xE6\x15\x39",
+				"\xA\x39\x3\xFFFF\x1\x39\x3\xFFFF\x1A\x39\x4\xFFFF\x1\x39\x1\xFFFF\x3"+
+				"\x39\x1\xE7\x16\x39",
 				"\x1\xE8",
-				"\xA\x1D\x7\xFFFF\x1A\x1D\x4\xFFFF\x1\x1D\x1\xFFFF\x1A\x1D",
+				"\x1\xE9",
+				"\xA\x1E\x7\xFFFF\x1A\x1E\x4\xFFFF\x1\x1E\x1\xFFFF\x12\x1E\x1\xEA\x7"+
+				"\x1E",
+				"\x1\xEC",
+				"\x1\xED",
+				"",
+				"",
+				"\xA\x1E\x7\xFFFF\x1A\x1E\x4\xFFFF\x1\x1E\x1\xFFFF\x12\x1E\x1\xEE\x7"+
+				"\x1E",
+				"",
+				"",
+				"\x1\xF0",
+				"\x1\xF1",
+				"\x1\xF2",
+				"\xA\x1E\x7\xFFFF\x1A\x1E\x4\xFFFF\x1\x1E\x1\xFFFF\x1A\x1E",
+				"\x1\xF4",
+				"",
+				"\xA\x39\x3\xFFFF\x1\xF5\x3\xFFFF\x1A\x39\x4\xFFFF\x1\x39\x1\xFFFF\x1A"+
+				"\x39",
+				"\xA\x39\x3\xFFFF\x1\xF6\x3\xFFFF\x1A\x39\x4\xFFFF\x1\x39\x1\xFFFF\x1A"+
+				"\x39",
+				"\xA\x39\x3\xFFFF\x1\x39\x3\xFFFF\x1A\x39\x4\xFFFF\x1\x39\x1\xFFFF\x18"+
+				"\x39\x1\xF7\x1\x39",
+				"",
+				"\xA\x39\x3\xFFFF\x1\x39\x3\xFFFF\x1A\x39\x4\xFFFF\x1\x39\x1\xFFFF\x2"+
+				"\x39\x1\xF9\x17\x39",
+				"\xA\x39\x3\xFFFF\x1\xFA\x3\xFFFF\x1A\x39\x4\xFFFF\x1\x39\x1\xFFFF\x1A"+
+				"\x39",
+				"\x1\xFB",
+				"\x1\xFC",
+				"\xA\x1E\x7\xFFFF\x1A\x1E\x4\xFFFF\x1\x1E\x1\xFFFF\x1A\x1E",
+				"",
+				"\xA\x1E\x7\xFFFF\x1A\x1E\x4\xFFFF\x1\x1E\x1\xFFFF\x1A\x1E",
+				"\xA\x1E\x7\xFFFF\x1A\x1E\x4\xFFFF\x1\x1E\x1\xFFFF\x1A\x1E",
+				"\xA\x1E\x7\xFFFF\x1A\x1E\x4\xFFFF\x1\x1E\x1\xFFFF\x1A\x1E",
+				"",
+				"\xA\x1E\x7\xFFFF\x1A\x1E\x4\xFFFF\x1\x1E\x1\xFFFF\x1A\x1E",
+				"\xA\x1E\x7\xFFFF\x1A\x1E\x4\xFFFF\x1\x1E\x1\xFFFF\x1A\x1E",
+				"\x1\x103",
 				"",
-				"\xA\x1D\x7\xFFFF\x1A\x1D\x4\xFFFF\x1\x1D\x1\xFFFF\x1A\x1D",
-				"\xA\x1D\x7\xFFFF\x1A\x1D\x4\xFFFF\x1\x1D\x1\xFFFF\x1A\x1D",
-				"\xA\x1D\x7\xFFFF\x1A\x1D\x4\xFFFF\x1\x1D\x1\xFFFF\x1A\x1D",
+				"\x1\x104",
 				"",
-				"\xA\x1D\x7\xFFFF\x1A\x1D\x4\xFFFF\x1\x1D\x1\xFFFF\x1A\x1D",
-				"\xA\x1D\x7\xFFFF\x1A\x1D\x4\xFFFF\x1\x1D\x1\xFFFF\x1A\x1D",
 				"",
-				"\x1\xEF",
+				"\xA\x39\x3\xFFFF\x1\x107\x3\xFFFF\x1A\x39\x4\xFFFF\x1\x39\x1\xFFFF\x1A"+
+				"\x39",
 				"",
+				"\xA\x39\x3\xFFFF\x1\x39\x3\xFFFF\x1A\x39\x4\xFFFF\x1\x39\x1\xFFFF\xE"+
+				"\x39\x1\x108\xB\x39",
 				"",
-				"\xA\x36\x3\xFFFF\x1\xF2\x3\xFFFF\x1A\x36\x4\xFFFF\x1\x36\x1\xFFFF\x1A"+
-				"\x36",
-				"\xA\x36\x3\xFFFF\x1\x36\x3\xFFFF\x1A\x36\x4\xFFFF\x1\x36\x1\xFFFF\xE"+
-				"\x36\x1\xF3\xB\x36",
+				"\x1\x10A",
+				"\x1\x10B",
 				"",
-				"\x1\xF5",
-				"\x1\xF6",
 				"",
 				"",
 				"",
 				"",
 				"",
+				"\xA\x1E\x7\xFFFF\x1A\x1E\x4\xFFFF\x1\x1E\x1\xFFFF\x1A\x1E",
 				"",
 				"",
 				"",
 				"",
+				"\xA\x39\x3\xFFFF\x1\x39\x3\xFFFF\x1A\x39\x4\xFFFF\x1\x39\x1\xFFFF\x14"+
+				"\x39\x1\x10E\x5\x39",
 				"",
-				"\xA\x36\x3\xFFFF\x1\x36\x3\xFFFF\x1A\x36\x4\xFFFF\x1\x36\x1\xFFFF\x14"+
-				"\x36\x1\xF8\x5\x36",
+				"\x1\x10F",
+				"\x1\x110",
 				"",
-				"\x1\xF9",
-				"\x1\xFA",
 				"",
-				"\xA\x36\x3\xFFFF\x1\x36\x3\xFFFF\x1A\x36\x4\xFFFF\x1\x36\x1\xFFFF\xD"+
-				"\x36\x1\xFB\xC\x36",
-				"\xA\x1D\x7\xFFFF\x1A\x1D\x4\xFFFF\x1\x1D\x1\xFFFF\x1A\x1D",
-				"\x1\xFD",
-				"\xA\x36\x3\xFFFF\x1\x36\x3\xFFFF\x1A\x36\x4\xFFFF\x1\x36\x1\xFFFF\x13"+
-				"\x36\x1\xFE\x6\x36",
+				"\xA\x39\x3\xFFFF\x1\x39\x3\xFFFF\x1A\x39\x4\xFFFF\x1\x39\x1\xFFFF\xD"+
+				"\x39\x1\x111\xC\x39",
+				"\xA\x1E\x7\xFFFF\x1A\x1E\x4\xFFFF\x1\x1E\x1\xFFFF\x1A\x1E",
+				"\x1\x113",
+				"\xA\x39\x3\xFFFF\x1\x39\x3\xFFFF\x1A\x39\x4\xFFFF\x1\x39\x1\xFFFF\x13"+
+				"\x39\x1\x114\x6\x39",
 				"",
-				"\xA\x1D\x7\xFFFF\x1A\x1D\x4\xFFFF\x1\x1D\x1\xFFFF\x1A\x1D",
-				"\xA\x36\x3\xFFFF\x1\x100\x3\xFFFF\x1A\x36\x4\xFFFF\x1\x36\x1\xFFFF\x1A"+
-				"\x36",
+				"\xA\x1E\x7\xFFFF\x1A\x1E\x4\xFFFF\x1\x1E\x1\xFFFF\x1A\x1E",
+				"\xA\x39\x3\xFFFF\x1\x116\x3\xFFFF\x1A\x39\x4\xFFFF\x1\x39\x1\xFFFF\x1A"+
+				"\x39",
 				"",
 				"",
 				""
@@ -5250,7 +5469,7 @@ public DFA34( BaseRecognizer recognizer )
 			this.transition = DFA34_transition;
 		}
 
-		public override string Description { get { return "1:1: Tokens : ( T__70 | T__71 | T__72 | T__73 | T__74 | T__75 | ASSIGN | EQUALS | NOTEQUALS | GREATERTHAN | GREATERTHANOREQUAL | LESSTHAN | LESSTHANOREQUAL | NOT | OR | AND | ASC | DESC | ALLPAGES | NONE | SKIP | TOP | FILTER | ORDERBY | SELECT | INLINECOUNT | EXPAND | IGNORED | STARTSWITH | ENDSWITH | SUBSTRINGOF | TOLOWER | TOUPPER | YEAR | YEARS | MONTH | DAY | DAYS | HOUR | HOURS | MINUTE | MINUTES | SECOND | SECONDS | ANY | ALL | COUNT | MIN | MAX | SUM | AVERAGE | INT | LONG | DOUBLE | SINGLE | DECIMAL | BOOL | NULL | DATETIME | GUID | BYTE | SPACE | NEWLINE | DYNAMICIDENTIFIER | IDENTIFIER | STRING );"; } }
+		public override string Description { get { return "1:1: Tokens : ( T__74 | T__75 | T__76 | T__77 | T__78 | T__79 | ASSIGN | EQUALS | NOTEQUALS | GREATERTHAN | GREATERTHANOREQUAL | LESSTHAN | LESSTHANOREQUAL | NOT | OR | AND | ASC | DESC | ALLPAGES | NONE | SKIP | TOP | FILTER | ORDERBY | SELECT | APPLY | AGGREGATE | INLINECOUNT | EXPAND | IGNORED | STARTSWITH | ENDSWITH | SUBSTRINGOF | TOLOWER | TOUPPER | YEAR | YEARS | MONTH | DAY | DAYS | HOUR | HOURS | MINUTE | MINUTES | SECOND | SECONDS | ANY | ALL | COUNT | MIN | MAX | SUM | AVERAGE | AS | WITH | INT | LONG | DOUBLE | SINGLE | DECIMAL | BOOL | NULL | DATETIME | GUID | BYTE | SPACE | NEWLINE | DYNAMICIDENTIFIER | IDENTIFIER | STRING );"; } }
 
 		public override void Error(NoViableAltException nvae)
 		{
diff --git a/LinqToQuerystring/LinqToQuerystringParser.cs b/LinqToQuerystring/LinqToQuerystringParser.cs
index 1a704ef..3289f5f 100644
--- a/LinqToQuerystring/LinqToQuerystringParser.cs
+++ b/LinqToQuerystring/LinqToQuerystringParser.cs
@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-// $ANTLR 3.5.0.2 C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g 2014-04-18 09:38:51
+// $ANTLR 3.5.0.2 C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g 2019-03-07 21:48:00
 
 // The variable 'variable' is assigned but its value is never used.
 #pragma warning disable 219
@@ -35,81 +35,85 @@ namespace  LinqToQuerystring
 public partial class LinqToQuerystringParser : Antlr.Runtime.Parser
 {
 	internal static readonly string[] tokenNames = new string[] {
-		"<invalid>", "<EOR>", "<DOWN>", "<UP>", "ALIAS", "ALL", "ALLPAGES", "AND", "ANY", "ASC", "ASSIGN", "AVERAGE", "BOOL", "BYTE", "COUNT", "DATETIME", "DAY", "DAYS", "DECIMAL", "DESC", "DOUBLE", "DYNAMICIDENTIFIER", "ENDSWITH", "EQUALS", "ESC_SEQ", "EXPAND", "FILTER", "GREATERTHAN", "GREATERTHANOREQUAL", "GUID", "HEX_DIGIT", "HEX_PAIR", "HOUR", "HOURS", "IDENTIFIER", "IGNORED", "INLINECOUNT", "INT", "LESSTHAN", "LESSTHANOREQUAL", "LONG", "MAX", "MIN", "MINUTE", "MINUTES", "MONTH", "NEWLINE", "NONE", "NOT", "NOTEQUALS", "NULL", "OCTAL_ESC", "OR", "ORDERBY", "SECOND", "SECONDS", "SELECT", "SINGLE", "SKIP", "SPACE", "STARTSWITH", "STRING", "SUBSTRINGOF", "SUM", "TOLOWER", "TOP", "TOUPPER", "UNICODE_ESC", "YEAR", "YEARS", "'&'", "'('", "')'", "','", "'/'", "':'"
+		"<invalid>", "<EOR>", "<DOWN>", "<UP>", "AGGREGATE", "ALIAS", "ALL", "ALLPAGES", "AND", "ANY", "APPLY", "AS", "ASC", "ASSIGN", "AVERAGE", "BOOL", "BYTE", "COUNT", "DATETIME", "DAY", "DAYS", "DECIMAL", "DESC", "DOUBLE", "DYNAMICIDENTIFIER", "ENDSWITH", "EQUALS", "ESC_SEQ", "EXPAND", "FILTER", "GREATERTHAN", "GREATERTHANOREQUAL", "GUID", "HEX_DIGIT", "HEX_PAIR", "HOUR", "HOURS", "IDENTIFIER", "IGNORED", "INLINECOUNT", "INT", "LESSTHAN", "LESSTHANOREQUAL", "LONG", "MAX", "MIN", "MINUTE", "MINUTES", "MONTH", "NEWLINE", "NONE", "NOT", "NOTEQUALS", "NULL", "OCTAL_ESC", "OR", "ORDERBY", "SECOND", "SECONDS", "SELECT", "SINGLE", "SKIP", "SPACE", "STARTSWITH", "STRING", "SUBSTRINGOF", "SUM", "TOLOWER", "TOP", "TOUPPER", "UNICODE_ESC", "WITH", "YEAR", "YEARS", "'&'", "'('", "')'", "','", "'/'", "':'"
 	};
 	public const int EOF=-1;
-	public const int ALIAS=4;
-	public const int ALL=5;
-	public const int ALLPAGES=6;
-	public const int AND=7;
-	public const int ANY=8;
-	public const int ASC=9;
-	public const int ASSIGN=10;
-	public const int AVERAGE=11;
-	public const int BOOL=12;
-	public const int BYTE=13;
-	public const int COUNT=14;
-	public const int DATETIME=15;
-	public const int DAY=16;
-	public const int DAYS=17;
-	public const int DECIMAL=18;
-	public const int DESC=19;
-	public const int DOUBLE=20;
-	public const int DYNAMICIDENTIFIER=21;
-	public const int ENDSWITH=22;
-	public const int EQUALS=23;
-	public const int ESC_SEQ=24;
-	public const int EXPAND=25;
-	public const int FILTER=26;
-	public const int GREATERTHAN=27;
-	public const int GREATERTHANOREQUAL=28;
-	public const int GUID=29;
-	public const int HEX_DIGIT=30;
-	public const int HEX_PAIR=31;
-	public const int HOUR=32;
-	public const int HOURS=33;
-	public const int IDENTIFIER=34;
-	public const int IGNORED=35;
-	public const int INLINECOUNT=36;
-	public const int INT=37;
-	public const int LESSTHAN=38;
-	public const int LESSTHANOREQUAL=39;
-	public const int LONG=40;
-	public const int MAX=41;
-	public const int MIN=42;
-	public const int MINUTE=43;
-	public const int MINUTES=44;
-	public const int MONTH=45;
-	public const int NEWLINE=46;
-	public const int NONE=47;
-	public const int NOT=48;
-	public const int NOTEQUALS=49;
-	public const int NULL=50;
-	public const int OCTAL_ESC=51;
-	public const int OR=52;
-	public const int ORDERBY=53;
-	public const int SECOND=54;
-	public const int SECONDS=55;
-	public const int SELECT=56;
-	public const int SINGLE=57;
-	public const int SKIP=58;
-	public const int SPACE=59;
-	public const int STARTSWITH=60;
-	public const int STRING=61;
-	public const int SUBSTRINGOF=62;
-	public const int SUM=63;
-	public const int TOLOWER=64;
-	public const int TOP=65;
-	public const int TOUPPER=66;
-	public const int UNICODE_ESC=67;
-	public const int YEAR=68;
-	public const int YEARS=69;
-	public const int T__70=70;
-	public const int T__71=71;
-	public const int T__72=72;
-	public const int T__73=73;
+	public const int AGGREGATE=4;
+	public const int ALIAS=5;
+	public const int ALL=6;
+	public const int ALLPAGES=7;
+	public const int AND=8;
+	public const int ANY=9;
+	public const int APPLY=10;
+	public const int AS=11;
+	public const int ASC=12;
+	public const int ASSIGN=13;
+	public const int AVERAGE=14;
+	public const int BOOL=15;
+	public const int BYTE=16;
+	public const int COUNT=17;
+	public const int DATETIME=18;
+	public const int DAY=19;
+	public const int DAYS=20;
+	public const int DECIMAL=21;
+	public const int DESC=22;
+	public const int DOUBLE=23;
+	public const int DYNAMICIDENTIFIER=24;
+	public const int ENDSWITH=25;
+	public const int EQUALS=26;
+	public const int ESC_SEQ=27;
+	public const int EXPAND=28;
+	public const int FILTER=29;
+	public const int GREATERTHAN=30;
+	public const int GREATERTHANOREQUAL=31;
+	public const int GUID=32;
+	public const int HEX_DIGIT=33;
+	public const int HEX_PAIR=34;
+	public const int HOUR=35;
+	public const int HOURS=36;
+	public const int IDENTIFIER=37;
+	public const int IGNORED=38;
+	public const int INLINECOUNT=39;
+	public const int INT=40;
+	public const int LESSTHAN=41;
+	public const int LESSTHANOREQUAL=42;
+	public const int LONG=43;
+	public const int MAX=44;
+	public const int MIN=45;
+	public const int MINUTE=46;
+	public const int MINUTES=47;
+	public const int MONTH=48;
+	public const int NEWLINE=49;
+	public const int NONE=50;
+	public const int NOT=51;
+	public const int NOTEQUALS=52;
+	public const int NULL=53;
+	public const int OCTAL_ESC=54;
+	public const int OR=55;
+	public const int ORDERBY=56;
+	public const int SECOND=57;
+	public const int SECONDS=58;
+	public const int SELECT=59;
+	public const int SINGLE=60;
+	public const int SKIP=61;
+	public const int SPACE=62;
+	public const int STARTSWITH=63;
+	public const int STRING=64;
+	public const int SUBSTRINGOF=65;
+	public const int SUM=66;
+	public const int TOLOWER=67;
+	public const int TOP=68;
+	public const int TOUPPER=69;
+	public const int UNICODE_ESC=70;
+	public const int WITH=71;
+	public const int YEAR=72;
+	public const int YEARS=73;
 	public const int T__74=74;
 	public const int T__75=75;
+	public const int T__76=76;
+	public const int T__77=77;
+	public const int T__78=78;
+	public const int T__79=79;
 
 	public LinqToQuerystringParser(ITokenStream input)
 		: this(input, new RecognizerSharedState())
@@ -142,7 +146,7 @@ public ITreeAdaptor TreeAdaptor
 	}
 
 	public override string[] TokenNames { get { return LinqToQuerystringParser.tokenNames; } }
-	public override string GrammarFileName { get { return "C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g"; } }
+	public override string GrammarFileName { get { return "C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g"; } }
 
 
 	partial void OnCreated();
@@ -153,7 +157,7 @@ public ITreeAdaptor TreeAdaptor
 	partial void EnterRule_prog();
 	partial void LeaveRule_prog();
 	// $ANTLR start "prog"
-	// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:33:8: public prog : ( param ( '&' ! param )* )* ;
+	// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:33:8: public prog : ( param ( '&' ! param )* )* ;
 	[GrammarRule("prog")]
 	public AstParserRuleReturnScope<object, IToken> prog()
 	{
@@ -174,14 +178,14 @@ public AstParserRuleReturnScope<object, IToken> prog()
 		DebugLocation(33, 25);
 		try
 		{
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:34:2: ( ( param ( '&' ! param )* )* )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:34:2: ( ( param ( '&' ! param )* )* )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:34:4: ( param ( '&' ! param )* )*
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:34:4: ( param ( '&' ! param )* )*
 			{
 			root_0 = (object)adaptor.Nil();
 
 			DebugLocation(34, 4);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:34:4: ( param ( '&' ! param )* )*
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:34:4: ( param ( '&' ! param )* )*
 			try { DebugEnterSubRule(2);
 			while (true)
 			{
@@ -189,7 +193,7 @@ public AstParserRuleReturnScope<object, IToken> prog()
 				try { DebugEnterDecision(2, false);
 				int LA2_1 = input.LA(1);
 
-				if (((LA2_1>=EXPAND && LA2_1<=FILTER)||(LA2_1>=IGNORED && LA2_1<=INLINECOUNT)||LA2_1==ORDERBY||LA2_1==SELECT||LA2_1==SKIP||LA2_1==TOP))
+				if ((LA2_1==APPLY||(LA2_1>=EXPAND && LA2_1<=FILTER)||(LA2_1>=IGNORED && LA2_1<=INLINECOUNT)||LA2_1==ORDERBY||LA2_1==SELECT||LA2_1==SKIP||LA2_1==TOP))
 				{
 					alt2 = 1;
 				}
@@ -200,7 +204,7 @@ public AstParserRuleReturnScope<object, IToken> prog()
 				{
 				case 1:
 					DebugEnterAlt(1);
-					// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:34:5: param ( '&' ! param )*
+					// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:34:5: param ( '&' ! param )*
 					{
 					DebugLocation(34, 5);
 					PushFollow(Follow._param_in_prog76);
@@ -209,7 +213,7 @@ public AstParserRuleReturnScope<object, IToken> prog()
 
 					adaptor.AddChild(root_0, param1.Tree);
 					DebugLocation(34, 11);
-					// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:34:11: ( '&' ! param )*
+					// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:34:11: ( '&' ! param )*
 					try { DebugEnterSubRule(1);
 					while (true)
 					{
@@ -217,7 +221,7 @@ public AstParserRuleReturnScope<object, IToken> prog()
 						try { DebugEnterDecision(1, false);
 						int LA1_1 = input.LA(1);
 
-						if ((LA1_1==70))
+						if ((LA1_1==74))
 						{
 							alt1 = 1;
 						}
@@ -228,10 +232,10 @@ public AstParserRuleReturnScope<object, IToken> prog()
 						{
 						case 1:
 							DebugEnterAlt(1);
-							// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:34:12: '&' ! param
+							// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:34:12: '&' ! param
 							{
 							DebugLocation(34, 15);
-							char_literal2=(IToken)Match(input,70,Follow._70_in_prog79); 
+							char_literal2=(IToken)Match(input,74,Follow._74_in_prog79); 
 							DebugLocation(34, 17);
 							PushFollow(Follow._param_in_prog82);
 							param3=param();
@@ -298,7 +302,7 @@ public AstParserRuleReturnScope<object, IToken> prog()
 	partial void EnterRule_param();
 	partial void LeaveRule_param();
 	// $ANTLR start "param"
-	// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:36:1: param : ( orderby | top | skip | filter | select | inlinecount | expand | ignored ) ;
+	// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:36:1: param : ( orderby | top | skip | filter | select | inlinecount | expand | ignored | apply ) ;
 	[GrammarRule("param")]
 	private AstParserRuleReturnScope<object, IToken> param()
 	{
@@ -318,20 +322,21 @@ private AstParserRuleReturnScope<object, IToken> param()
 		AstParserRuleReturnScope<object, IToken> inlinecount9 = default(AstParserRuleReturnScope<object, IToken>);
 		AstParserRuleReturnScope<object, IToken> expand10 = default(AstParserRuleReturnScope<object, IToken>);
 		AstParserRuleReturnScope<object, IToken> ignored11 = default(AstParserRuleReturnScope<object, IToken>);
+		AstParserRuleReturnScope<object, IToken> apply12 = default(AstParserRuleReturnScope<object, IToken>);
 
 		try { DebugEnterRule(GrammarFileName, "param");
-		DebugLocation(36, 81);
+		DebugLocation(36, 89);
 		try
 		{
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:36:7: ( ( orderby | top | skip | filter | select | inlinecount | expand | ignored ) )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:36:7: ( ( orderby | top | skip | filter | select | inlinecount | expand | ignored | apply ) )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:36:9: ( orderby | top | skip | filter | select | inlinecount | expand | ignored )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:36:9: ( orderby | top | skip | filter | select | inlinecount | expand | ignored | apply )
 			{
 			root_0 = (object)adaptor.Nil();
 
 			DebugLocation(36, 9);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:36:9: ( orderby | top | skip | filter | select | inlinecount | expand | ignored )
-			int alt3=8;
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:36:9: ( orderby | top | skip | filter | select | inlinecount | expand | ignored | apply )
+			int alt3=9;
 			try { DebugEnterSubRule(3);
 			try { DebugEnterDecision(3, false);
 			switch (input.LA(1))
@@ -376,6 +381,11 @@ private AstParserRuleReturnScope<object, IToken> param()
 				alt3 = 8;
 				}
 				break;
+			case APPLY:
+				{
+				alt3 = 9;
+				}
+				break;
 			default:
 				{
 					NoViableAltException nvae = new NoViableAltException("", 3, 0, input, 1);
@@ -389,7 +399,7 @@ private AstParserRuleReturnScope<object, IToken> param()
 			{
 			case 1:
 				DebugEnterAlt(1);
-				// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:36:10: orderby
+				// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:36:10: orderby
 				{
 				DebugLocation(36, 10);
 				PushFollow(Follow._orderby_in_param95);
@@ -402,7 +412,7 @@ private AstParserRuleReturnScope<object, IToken> param()
 				break;
 			case 2:
 				DebugEnterAlt(2);
-				// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:36:20: top
+				// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:36:20: top
 				{
 				DebugLocation(36, 20);
 				PushFollow(Follow._top_in_param99);
@@ -415,7 +425,7 @@ private AstParserRuleReturnScope<object, IToken> param()
 				break;
 			case 3:
 				DebugEnterAlt(3);
-				// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:36:26: skip
+				// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:36:26: skip
 				{
 				DebugLocation(36, 26);
 				PushFollow(Follow._skip_in_param103);
@@ -428,7 +438,7 @@ private AstParserRuleReturnScope<object, IToken> param()
 				break;
 			case 4:
 				DebugEnterAlt(4);
-				// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:36:33: filter
+				// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:36:33: filter
 				{
 				DebugLocation(36, 33);
 				PushFollow(Follow._filter_in_param107);
@@ -441,7 +451,7 @@ private AstParserRuleReturnScope<object, IToken> param()
 				break;
 			case 5:
 				DebugEnterAlt(5);
-				// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:36:42: select
+				// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:36:42: select
 				{
 				DebugLocation(36, 42);
 				PushFollow(Follow._select_in_param111);
@@ -454,7 +464,7 @@ private AstParserRuleReturnScope<object, IToken> param()
 				break;
 			case 6:
 				DebugEnterAlt(6);
-				// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:36:51: inlinecount
+				// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:36:51: inlinecount
 				{
 				DebugLocation(36, 51);
 				PushFollow(Follow._inlinecount_in_param115);
@@ -467,7 +477,7 @@ private AstParserRuleReturnScope<object, IToken> param()
 				break;
 			case 7:
 				DebugEnterAlt(7);
-				// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:36:65: expand
+				// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:36:65: expand
 				{
 				DebugLocation(36, 65);
 				PushFollow(Follow._expand_in_param119);
@@ -480,7 +490,7 @@ private AstParserRuleReturnScope<object, IToken> param()
 				break;
 			case 8:
 				DebugEnterAlt(8);
-				// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:36:74: ignored
+				// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:36:74: ignored
 				{
 				DebugLocation(36, 74);
 				PushFollow(Follow._ignored_in_param123);
@@ -489,6 +499,19 @@ private AstParserRuleReturnScope<object, IToken> param()
 
 				adaptor.AddChild(root_0, ignored11.Tree);
 
+				}
+				break;
+			case 9:
+				DebugEnterAlt(9);
+				// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:36:84: apply
+				{
+				DebugLocation(36, 84);
+				PushFollow(Follow._apply_in_param127);
+				apply12=apply();
+				PopFollow();
+
+				adaptor.AddChild(root_0, apply12.Tree);
+
 				}
 				break;
 
@@ -517,7 +540,7 @@ private AstParserRuleReturnScope<object, IToken> param()
 			LeaveRule("param", 2);
 			LeaveRule_param();
 		}
-		DebugLocation(36, 81);
+		DebugLocation(36, 89);
 		} finally { DebugExitRule(GrammarFileName, "param"); }
 		return retval;
 
@@ -527,7 +550,7 @@ private AstParserRuleReturnScope<object, IToken> param()
 	partial void EnterRule_skip();
 	partial void LeaveRule_skip();
 	// $ANTLR start "skip"
-	// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:38:1: skip : SKIP ^ ( INT )+ ;
+	// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:38:1: skip : SKIP ^ ( INT )+ ;
 	[GrammarRule("skip")]
 	private AstParserRuleReturnScope<object, IToken> skip()
 	{
@@ -539,27 +562,27 @@ private AstParserRuleReturnScope<object, IToken> skip()
 
 		object root_0 = default(object);
 
-		IToken SKIP12 = default(IToken);
-		IToken INT13 = default(IToken);
+		IToken SKIP13 = default(IToken);
+		IToken INT14 = default(IToken);
 
-		object SKIP12_tree = default(object);
-		object INT13_tree = default(object);
+		object SKIP13_tree = default(object);
+		object INT14_tree = default(object);
 		try { DebugEnterRule(GrammarFileName, "skip");
 		DebugLocation(38, 13);
 		try
 		{
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:39:2: ( SKIP ^ ( INT )+ )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:39:2: ( SKIP ^ ( INT )+ )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:39:4: SKIP ^ ( INT )+
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:39:4: SKIP ^ ( INT )+
 			{
 			root_0 = (object)adaptor.Nil();
 
 			DebugLocation(39, 8);
-			SKIP12=(IToken)Match(input,SKIP,Follow._SKIP_in_skip134); 
-			SKIP12_tree = (object)adaptor.Create(SKIP12);
-			root_0 = (object)adaptor.BecomeRoot(SKIP12_tree, root_0);
+			SKIP13=(IToken)Match(input,SKIP,Follow._SKIP_in_skip138); 
+			SKIP13_tree = (object)adaptor.Create(SKIP13);
+			root_0 = (object)adaptor.BecomeRoot(SKIP13_tree, root_0);
 			DebugLocation(39, 10);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:39:10: ( INT )+
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:39:10: ( INT )+
 			int cnt4=0;
 			try { DebugEnterSubRule(4);
 			while (true)
@@ -579,12 +602,12 @@ private AstParserRuleReturnScope<object, IToken> skip()
 				{
 				case 1:
 					DebugEnterAlt(1);
-					// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:39:10: INT
+					// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:39:10: INT
 					{
 					DebugLocation(39, 10);
-					INT13=(IToken)Match(input,INT,Follow._INT_in_skip137); 
-					INT13_tree = (object)adaptor.Create(INT13);
-					adaptor.AddChild(root_0, INT13_tree);
+					INT14=(IToken)Match(input,INT,Follow._INT_in_skip141); 
+					INT14_tree = (object)adaptor.Create(INT14);
+					adaptor.AddChild(root_0, INT14_tree);
 
 					}
 					break;
@@ -636,7 +659,7 @@ private AstParserRuleReturnScope<object, IToken> skip()
 	partial void EnterRule_top();
 	partial void LeaveRule_top();
 	// $ANTLR start "top"
-	// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:41:1: top : TOP ^ ( INT )+ ;
+	// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:41:1: top : TOP ^ ( INT )+ ;
 	[GrammarRule("top")]
 	private AstParserRuleReturnScope<object, IToken> top()
 	{
@@ -648,27 +671,27 @@ private AstParserRuleReturnScope<object, IToken> top()
 
 		object root_0 = default(object);
 
-		IToken TOP14 = default(IToken);
-		IToken INT15 = default(IToken);
+		IToken TOP15 = default(IToken);
+		IToken INT16 = default(IToken);
 
-		object TOP14_tree = default(object);
-		object INT15_tree = default(object);
+		object TOP15_tree = default(object);
+		object INT16_tree = default(object);
 		try { DebugEnterRule(GrammarFileName, "top");
 		DebugLocation(41, 12);
 		try
 		{
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:42:2: ( TOP ^ ( INT )+ )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:42:2: ( TOP ^ ( INT )+ )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:42:4: TOP ^ ( INT )+
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:42:4: TOP ^ ( INT )+
 			{
 			root_0 = (object)adaptor.Nil();
 
 			DebugLocation(42, 7);
-			TOP14=(IToken)Match(input,TOP,Follow._TOP_in_top148); 
-			TOP14_tree = (object)adaptor.Create(TOP14);
-			root_0 = (object)adaptor.BecomeRoot(TOP14_tree, root_0);
+			TOP15=(IToken)Match(input,TOP,Follow._TOP_in_top152); 
+			TOP15_tree = (object)adaptor.Create(TOP15);
+			root_0 = (object)adaptor.BecomeRoot(TOP15_tree, root_0);
 			DebugLocation(42, 9);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:42:9: ( INT )+
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:42:9: ( INT )+
 			int cnt5=0;
 			try { DebugEnterSubRule(5);
 			while (true)
@@ -688,12 +711,12 @@ private AstParserRuleReturnScope<object, IToken> top()
 				{
 				case 1:
 					DebugEnterAlt(1);
-					// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:42:9: INT
+					// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:42:9: INT
 					{
 					DebugLocation(42, 9);
-					INT15=(IToken)Match(input,INT,Follow._INT_in_top151); 
-					INT15_tree = (object)adaptor.Create(INT15);
-					adaptor.AddChild(root_0, INT15_tree);
+					INT16=(IToken)Match(input,INT,Follow._INT_in_top155); 
+					INT16_tree = (object)adaptor.Create(INT16);
+					adaptor.AddChild(root_0, INT16_tree);
 
 					}
 					break;
@@ -708,11 +731,703 @@ private AstParserRuleReturnScope<object, IToken> top()
 				}
 				cnt5++;
 			}
-			loop5:
+			loop5:
+				;
+
+			} finally { DebugExitSubRule(5); }
+
+
+			}
+
+			retval.Stop = (IToken)input.LT(-1);
+
+			retval.Tree = (object)adaptor.RulePostProcessing(root_0);
+			adaptor.SetTokenBoundaries(retval.Tree, retval.Start, retval.Stop);
+
+		}
+		catch (RecognitionException re)
+		{
+			ReportError(re);
+			Recover(input,re);
+			retval.Tree = (object)adaptor.ErrorNode(input, retval.Start, input.LT(-1), re);
+
+		}
+		finally
+		{
+			TraceOut("top", 4);
+			LeaveRule("top", 4);
+			LeaveRule_top();
+		}
+		DebugLocation(42, 12);
+		} finally { DebugExitRule(GrammarFileName, "top"); }
+		return retval;
+
+	}
+	// $ANTLR end "top"
+
+	partial void EnterRule_filter();
+	partial void LeaveRule_filter();
+	// $ANTLR start "filter"
+	// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:44:1: filter : FILTER ^ filterexpression[false] ;
+	[GrammarRule("filter")]
+	private AstParserRuleReturnScope<object, IToken> filter()
+	{
+		EnterRule_filter();
+		EnterRule("filter", 5);
+		TraceIn("filter", 5);
+		AstParserRuleReturnScope<object, IToken> retval = new AstParserRuleReturnScope<object, IToken>();
+		retval.Start = (IToken)input.LT(1);
+
+		object root_0 = default(object);
+
+		IToken FILTER17 = default(IToken);
+		AstParserRuleReturnScope<object, IToken> filterexpression18 = default(AstParserRuleReturnScope<object, IToken>);
+
+		object FILTER17_tree = default(object);
+		try { DebugEnterRule(GrammarFileName, "filter");
+		DebugLocation(44, 34);
+		try
+		{
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:45:2: ( FILTER ^ filterexpression[false] )
+			DebugEnterAlt(1);
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:45:4: FILTER ^ filterexpression[false]
+			{
+			root_0 = (object)adaptor.Nil();
+
+			DebugLocation(45, 10);
+			FILTER17=(IToken)Match(input,FILTER,Follow._FILTER_in_filter166); 
+			FILTER17_tree = (object)adaptor.Create(FILTER17);
+			root_0 = (object)adaptor.BecomeRoot(FILTER17_tree, root_0);
+			DebugLocation(45, 12);
+			PushFollow(Follow._filterexpression_in_filter169);
+			filterexpression18=filterexpression(false);
+			PopFollow();
+
+			adaptor.AddChild(root_0, filterexpression18.Tree);
+
+			}
+
+			retval.Stop = (IToken)input.LT(-1);
+
+			retval.Tree = (object)adaptor.RulePostProcessing(root_0);
+			adaptor.SetTokenBoundaries(retval.Tree, retval.Start, retval.Stop);
+
+		}
+		catch (RecognitionException re)
+		{
+			ReportError(re);
+			Recover(input,re);
+			retval.Tree = (object)adaptor.ErrorNode(input, retval.Start, input.LT(-1), re);
+
+		}
+		finally
+		{
+			TraceOut("filter", 5);
+			LeaveRule("filter", 5);
+			LeaveRule_filter();
+		}
+		DebugLocation(45, 34);
+		} finally { DebugExitRule(GrammarFileName, "filter"); }
+		return retval;
+
+	}
+	// $ANTLR end "filter"
+
+	partial void EnterRule_select();
+	partial void LeaveRule_select();
+	// $ANTLR start "select"
+	// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:47:1: select : SELECT ^ propertyname[false] ( SPACE ! asexp )? ( ',' ! propertyname[false] ( SPACE ! asexp )? )* ;
+	[GrammarRule("select")]
+	private AstParserRuleReturnScope<object, IToken> select()
+	{
+		EnterRule_select();
+		EnterRule("select", 6);
+		TraceIn("select", 6);
+		AstParserRuleReturnScope<object, IToken> retval = new AstParserRuleReturnScope<object, IToken>();
+		retval.Start = (IToken)input.LT(1);
+
+		object root_0 = default(object);
+
+		IToken SELECT19 = default(IToken);
+		IToken SPACE21 = default(IToken);
+		IToken char_literal23 = default(IToken);
+		IToken SPACE25 = default(IToken);
+		AstParserRuleReturnScope<object, IToken> propertyname20 = default(AstParserRuleReturnScope<object, IToken>);
+		AstParserRuleReturnScope<object, IToken> asexp22 = default(AstParserRuleReturnScope<object, IToken>);
+		AstParserRuleReturnScope<object, IToken> propertyname24 = default(AstParserRuleReturnScope<object, IToken>);
+		AstParserRuleReturnScope<object, IToken> asexp26 = default(AstParserRuleReturnScope<object, IToken>);
+
+		object SELECT19_tree = default(object);
+		object SPACE21_tree = default(object);
+		object char_literal23_tree = default(object);
+		object SPACE25_tree = default(object);
+		try { DebugEnterRule(GrammarFileName, "select");
+		DebugLocation(47, 90);
+		try
+		{
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:48:2: ( SELECT ^ propertyname[false] ( SPACE ! asexp )? ( ',' ! propertyname[false] ( SPACE ! asexp )? )* )
+			DebugEnterAlt(1);
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:48:4: SELECT ^ propertyname[false] ( SPACE ! asexp )? ( ',' ! propertyname[false] ( SPACE ! asexp )? )*
+			{
+			root_0 = (object)adaptor.Nil();
+
+			DebugLocation(48, 10);
+			SELECT19=(IToken)Match(input,SELECT,Follow._SELECT_in_select180); 
+			SELECT19_tree = (object)adaptor.Create(SELECT19);
+			root_0 = (object)adaptor.BecomeRoot(SELECT19_tree, root_0);
+			DebugLocation(48, 12);
+			PushFollow(Follow._propertyname_in_select183);
+			propertyname20=propertyname(false);
+			PopFollow();
+
+			adaptor.AddChild(root_0, propertyname20.Tree);
+			DebugLocation(48, 32);
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:48:32: ( SPACE ! asexp )?
+			int alt6=2;
+			try { DebugEnterSubRule(6);
+			try { DebugEnterDecision(6, false);
+			int LA6_1 = input.LA(1);
+
+			if ((LA6_1==SPACE))
+			{
+				alt6 = 1;
+			}
+			} finally { DebugExitDecision(6); }
+			switch (alt6)
+			{
+			case 1:
+				DebugEnterAlt(1);
+				// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:48:33: SPACE ! asexp
+				{
+				DebugLocation(48, 38);
+				SPACE21=(IToken)Match(input,SPACE,Follow._SPACE_in_select187); 
+				DebugLocation(48, 40);
+				PushFollow(Follow._asexp_in_select190);
+				asexp22=asexp();
+				PopFollow();
+
+				adaptor.AddChild(root_0, asexp22.Tree);
+
+				}
+				break;
+
+			}
+			} finally { DebugExitSubRule(6); }
+
+			DebugLocation(48, 48);
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:48:48: ( ',' ! propertyname[false] ( SPACE ! asexp )? )*
+			try { DebugEnterSubRule(8);
+			while (true)
+			{
+				int alt8=2;
+				try { DebugEnterDecision(8, false);
+				int LA8_1 = input.LA(1);
+
+				if ((LA8_1==77))
+				{
+					alt8 = 1;
+				}
+
+
+				} finally { DebugExitDecision(8); }
+				switch ( alt8 )
+				{
+				case 1:
+					DebugEnterAlt(1);
+					// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:48:49: ',' ! propertyname[false] ( SPACE ! asexp )?
+					{
+					DebugLocation(48, 52);
+					char_literal23=(IToken)Match(input,77,Follow._77_in_select195); 
+					DebugLocation(48, 54);
+					PushFollow(Follow._propertyname_in_select198);
+					propertyname24=propertyname(false);
+					PopFollow();
+
+					adaptor.AddChild(root_0, propertyname24.Tree);
+					DebugLocation(48, 74);
+					// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:48:74: ( SPACE ! asexp )?
+					int alt7=2;
+					try { DebugEnterSubRule(7);
+					try { DebugEnterDecision(7, false);
+					int LA7_1 = input.LA(1);
+
+					if ((LA7_1==SPACE))
+					{
+						alt7 = 1;
+					}
+					} finally { DebugExitDecision(7); }
+					switch (alt7)
+					{
+					case 1:
+						DebugEnterAlt(1);
+						// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:48:75: SPACE ! asexp
+						{
+						DebugLocation(48, 80);
+						SPACE25=(IToken)Match(input,SPACE,Follow._SPACE_in_select202); 
+						DebugLocation(48, 82);
+						PushFollow(Follow._asexp_in_select205);
+						asexp26=asexp();
+						PopFollow();
+
+						adaptor.AddChild(root_0, asexp26.Tree);
+
+						}
+						break;
+
+					}
+					} finally { DebugExitSubRule(7); }
+
+
+					}
+					break;
+
+				default:
+					goto loop8;
+				}
+			}
+
+			loop8:
+				;
+
+			} finally { DebugExitSubRule(8); }
+
+
+			}
+
+			retval.Stop = (IToken)input.LT(-1);
+
+			retval.Tree = (object)adaptor.RulePostProcessing(root_0);
+			adaptor.SetTokenBoundaries(retval.Tree, retval.Start, retval.Stop);
+
+		}
+		catch (RecognitionException re)
+		{
+			ReportError(re);
+			Recover(input,re);
+			retval.Tree = (object)adaptor.ErrorNode(input, retval.Start, input.LT(-1), re);
+
+		}
+		finally
+		{
+			TraceOut("select", 6);
+			LeaveRule("select", 6);
+			LeaveRule_select();
+		}
+		DebugLocation(48, 90);
+		} finally { DebugExitRule(GrammarFileName, "select"); }
+		return retval;
+
+	}
+	// $ANTLR end "select"
+
+	partial void EnterRule_asexp();
+	partial void LeaveRule_asexp();
+	// $ANTLR start "asexp"
+	// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:50:1: asexp : AS ^ SPACE ! IDENTIFIER ;
+	[GrammarRule("asexp")]
+	private AstParserRuleReturnScope<object, IToken> asexp()
+	{
+		EnterRule_asexp();
+		EnterRule("asexp", 7);
+		TraceIn("asexp", 7);
+		AstParserRuleReturnScope<object, IToken> retval = new AstParserRuleReturnScope<object, IToken>();
+		retval.Start = (IToken)input.LT(1);
+
+		object root_0 = default(object);
+
+		IToken AS27 = default(IToken);
+		IToken SPACE28 = default(IToken);
+		IToken IDENTIFIER29 = default(IToken);
+
+		object AS27_tree = default(object);
+		object SPACE28_tree = default(object);
+		object IDENTIFIER29_tree = default(object);
+		try { DebugEnterRule(GrammarFileName, "asexp");
+		DebugLocation(50, 24);
+		try
+		{
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:51:2: ( AS ^ SPACE ! IDENTIFIER )
+			DebugEnterAlt(1);
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:51:4: AS ^ SPACE ! IDENTIFIER
+			{
+			root_0 = (object)adaptor.Nil();
+
+			DebugLocation(51, 6);
+			AS27=(IToken)Match(input,AS,Follow._AS_in_asexp221); 
+			AS27_tree = (object)adaptor.Create(AS27);
+			root_0 = (object)adaptor.BecomeRoot(AS27_tree, root_0);
+			DebugLocation(51, 13);
+			SPACE28=(IToken)Match(input,SPACE,Follow._SPACE_in_asexp224); 
+			DebugLocation(51, 15);
+			IDENTIFIER29=(IToken)Match(input,IDENTIFIER,Follow._IDENTIFIER_in_asexp227); 
+			IDENTIFIER29_tree = (object)adaptor.Create(IDENTIFIER29);
+			adaptor.AddChild(root_0, IDENTIFIER29_tree);
+
+			}
+
+			retval.Stop = (IToken)input.LT(-1);
+
+			retval.Tree = (object)adaptor.RulePostProcessing(root_0);
+			adaptor.SetTokenBoundaries(retval.Tree, retval.Start, retval.Stop);
+
+		}
+		catch (RecognitionException re)
+		{
+			ReportError(re);
+			Recover(input,re);
+			retval.Tree = (object)adaptor.ErrorNode(input, retval.Start, input.LT(-1), re);
+
+		}
+		finally
+		{
+			TraceOut("asexp", 7);
+			LeaveRule("asexp", 7);
+			LeaveRule_asexp();
+		}
+		DebugLocation(51, 24);
+		} finally { DebugExitRule(GrammarFileName, "asexp"); }
+		return retval;
+
+	}
+	// $ANTLR end "asexp"
+
+	partial void EnterRule_apply();
+	partial void LeaveRule_apply();
+	// $ANTLR start "apply"
+	// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:53:1: apply : APPLY ^ aggexpr ;
+	[GrammarRule("apply")]
+	private AstParserRuleReturnScope<object, IToken> apply()
+	{
+		EnterRule_apply();
+		EnterRule("apply", 8);
+		TraceIn("apply", 8);
+		AstParserRuleReturnScope<object, IToken> retval = new AstParserRuleReturnScope<object, IToken>();
+		retval.Start = (IToken)input.LT(1);
+
+		object root_0 = default(object);
+
+		IToken APPLY30 = default(IToken);
+		AstParserRuleReturnScope<object, IToken> aggexpr31 = default(AstParserRuleReturnScope<object, IToken>);
+
+		object APPLY30_tree = default(object);
+		try { DebugEnterRule(GrammarFileName, "apply");
+		DebugLocation(53, 17);
+		try
+		{
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:54:2: ( APPLY ^ aggexpr )
+			DebugEnterAlt(1);
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:54:4: APPLY ^ aggexpr
+			{
+			root_0 = (object)adaptor.Nil();
+
+			DebugLocation(54, 9);
+			APPLY30=(IToken)Match(input,APPLY,Follow._APPLY_in_apply236); 
+			APPLY30_tree = (object)adaptor.Create(APPLY30);
+			root_0 = (object)adaptor.BecomeRoot(APPLY30_tree, root_0);
+			DebugLocation(54, 11);
+			PushFollow(Follow._aggexpr_in_apply239);
+			aggexpr31=aggexpr();
+			PopFollow();
+
+			adaptor.AddChild(root_0, aggexpr31.Tree);
+
+			}
+
+			retval.Stop = (IToken)input.LT(-1);
+
+			retval.Tree = (object)adaptor.RulePostProcessing(root_0);
+			adaptor.SetTokenBoundaries(retval.Tree, retval.Start, retval.Stop);
+
+		}
+		catch (RecognitionException re)
+		{
+			ReportError(re);
+			Recover(input,re);
+			retval.Tree = (object)adaptor.ErrorNode(input, retval.Start, input.LT(-1), re);
+
+		}
+		finally
+		{
+			TraceOut("apply", 8);
+			LeaveRule("apply", 8);
+			LeaveRule_apply();
+		}
+		DebugLocation(54, 17);
+		} finally { DebugExitRule(GrammarFileName, "apply"); }
+		return retval;
+
+	}
+	// $ANTLR end "apply"
+
+	partial void EnterRule_aggexpr();
+	partial void LeaveRule_aggexpr();
+	// $ANTLR start "aggexpr"
+	// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:56:1: aggexpr : applyTrafo ( '/' ! applyTrafo )* ;
+	[GrammarRule("aggexpr")]
+	private AstParserRuleReturnScope<object, IToken> aggexpr()
+	{
+		EnterRule_aggexpr();
+		EnterRule("aggexpr", 9);
+		TraceIn("aggexpr", 9);
+		AstParserRuleReturnScope<object, IToken> retval = new AstParserRuleReturnScope<object, IToken>();
+		retval.Start = (IToken)input.LT(1);
+
+		object root_0 = default(object);
+
+		IToken char_literal33 = default(IToken);
+		AstParserRuleReturnScope<object, IToken> applyTrafo32 = default(AstParserRuleReturnScope<object, IToken>);
+		AstParserRuleReturnScope<object, IToken> applyTrafo34 = default(AstParserRuleReturnScope<object, IToken>);
+
+		object char_literal33_tree = default(object);
+		try { DebugEnterRule(GrammarFileName, "aggexpr");
+		DebugLocation(56, 32);
+		try
+		{
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:57:2: ( applyTrafo ( '/' ! applyTrafo )* )
+			DebugEnterAlt(1);
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:57:4: applyTrafo ( '/' ! applyTrafo )*
+			{
+			root_0 = (object)adaptor.Nil();
+
+			DebugLocation(57, 4);
+			PushFollow(Follow._applyTrafo_in_aggexpr248);
+			applyTrafo32=applyTrafo();
+			PopFollow();
+
+			adaptor.AddChild(root_0, applyTrafo32.Tree);
+			DebugLocation(57, 15);
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:57:15: ( '/' ! applyTrafo )*
+			try { DebugEnterSubRule(9);
+			while (true)
+			{
+				int alt9=2;
+				try { DebugEnterDecision(9, false);
+				int LA9_1 = input.LA(1);
+
+				if ((LA9_1==78))
+				{
+					alt9 = 1;
+				}
+
+
+				} finally { DebugExitDecision(9); }
+				switch ( alt9 )
+				{
+				case 1:
+					DebugEnterAlt(1);
+					// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:57:16: '/' ! applyTrafo
+					{
+					DebugLocation(57, 19);
+					char_literal33=(IToken)Match(input,78,Follow._78_in_aggexpr251); 
+					DebugLocation(57, 21);
+					PushFollow(Follow._applyTrafo_in_aggexpr254);
+					applyTrafo34=applyTrafo();
+					PopFollow();
+
+					adaptor.AddChild(root_0, applyTrafo34.Tree);
+
+					}
+					break;
+
+				default:
+					goto loop9;
+				}
+			}
+
+			loop9:
+				;
+
+			} finally { DebugExitSubRule(9); }
+
+
+			}
+
+			retval.Stop = (IToken)input.LT(-1);
+
+			retval.Tree = (object)adaptor.RulePostProcessing(root_0);
+			adaptor.SetTokenBoundaries(retval.Tree, retval.Start, retval.Stop);
+
+		}
+		catch (RecognitionException re)
+		{
+			ReportError(re);
+			Recover(input,re);
+			retval.Tree = (object)adaptor.ErrorNode(input, retval.Start, input.LT(-1), re);
+
+		}
+		finally
+		{
+			TraceOut("aggexpr", 9);
+			LeaveRule("aggexpr", 9);
+			LeaveRule_aggexpr();
+		}
+		DebugLocation(57, 32);
+		} finally { DebugExitRule(GrammarFileName, "aggexpr"); }
+		return retval;
+
+	}
+	// $ANTLR end "aggexpr"
+
+	partial void EnterRule_applyTrafo();
+	partial void LeaveRule_applyTrafo();
+	// $ANTLR start "applyTrafo"
+	// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:59:1: applyTrafo : aggregateTrafo ;
+	[GrammarRule("applyTrafo")]
+	private AstParserRuleReturnScope<object, IToken> applyTrafo()
+	{
+		EnterRule_applyTrafo();
+		EnterRule("applyTrafo", 10);
+		TraceIn("applyTrafo", 10);
+		AstParserRuleReturnScope<object, IToken> retval = new AstParserRuleReturnScope<object, IToken>();
+		retval.Start = (IToken)input.LT(1);
+
+		object root_0 = default(object);
+
+		AstParserRuleReturnScope<object, IToken> aggregateTrafo35 = default(AstParserRuleReturnScope<object, IToken>);
+
+		try { DebugEnterRule(GrammarFileName, "applyTrafo");
+		DebugLocation(59, 17);
+		try
+		{
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:60:2: ( aggregateTrafo )
+			DebugEnterAlt(1);
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:60:4: aggregateTrafo
+			{
+			root_0 = (object)adaptor.Nil();
+
+			DebugLocation(60, 4);
+			PushFollow(Follow._aggregateTrafo_in_applyTrafo265);
+			aggregateTrafo35=aggregateTrafo();
+			PopFollow();
+
+			adaptor.AddChild(root_0, aggregateTrafo35.Tree);
+
+			}
+
+			retval.Stop = (IToken)input.LT(-1);
+
+			retval.Tree = (object)adaptor.RulePostProcessing(root_0);
+			adaptor.SetTokenBoundaries(retval.Tree, retval.Start, retval.Stop);
+
+		}
+		catch (RecognitionException re)
+		{
+			ReportError(re);
+			Recover(input,re);
+			retval.Tree = (object)adaptor.ErrorNode(input, retval.Start, input.LT(-1), re);
+
+		}
+		finally
+		{
+			TraceOut("applyTrafo", 10);
+			LeaveRule("applyTrafo", 10);
+			LeaveRule_applyTrafo();
+		}
+		DebugLocation(60, 17);
+		} finally { DebugExitRule(GrammarFileName, "applyTrafo"); }
+		return retval;
+
+	}
+	// $ANTLR end "applyTrafo"
+
+	partial void EnterRule_aggregateTrafo();
+	partial void LeaveRule_aggregateTrafo();
+	// $ANTLR start "aggregateTrafo"
+	// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:62:1: aggregateTrafo : AGGREGATE ^ '(' aggregateExpr ( ',' ! aggregateExpr )* ')' ;
+	[GrammarRule("aggregateTrafo")]
+	private AstParserRuleReturnScope<object, IToken> aggregateTrafo()
+	{
+		EnterRule_aggregateTrafo();
+		EnterRule("aggregateTrafo", 11);
+		TraceIn("aggregateTrafo", 11);
+		AstParserRuleReturnScope<object, IToken> retval = new AstParserRuleReturnScope<object, IToken>();
+		retval.Start = (IToken)input.LT(1);
+
+		object root_0 = default(object);
+
+		IToken AGGREGATE36 = default(IToken);
+		IToken char_literal37 = default(IToken);
+		IToken char_literal39 = default(IToken);
+		IToken char_literal41 = default(IToken);
+		AstParserRuleReturnScope<object, IToken> aggregateExpr38 = default(AstParserRuleReturnScope<object, IToken>);
+		AstParserRuleReturnScope<object, IToken> aggregateExpr40 = default(AstParserRuleReturnScope<object, IToken>);
+
+		object AGGREGATE36_tree = default(object);
+		object char_literal37_tree = default(object);
+		object char_literal39_tree = default(object);
+		object char_literal41_tree = default(object);
+		try { DebugEnterRule(GrammarFileName, "aggregateTrafo");
+		DebugLocation(62, 56);
+		try
+		{
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:63:2: ( AGGREGATE ^ '(' aggregateExpr ( ',' ! aggregateExpr )* ')' )
+			DebugEnterAlt(1);
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:63:4: AGGREGATE ^ '(' aggregateExpr ( ',' ! aggregateExpr )* ')'
+			{
+			root_0 = (object)adaptor.Nil();
+
+			DebugLocation(63, 13);
+			AGGREGATE36=(IToken)Match(input,AGGREGATE,Follow._AGGREGATE_in_aggregateTrafo274); 
+			AGGREGATE36_tree = (object)adaptor.Create(AGGREGATE36);
+			root_0 = (object)adaptor.BecomeRoot(AGGREGATE36_tree, root_0);
+			DebugLocation(63, 15);
+			char_literal37=(IToken)Match(input,75,Follow._75_in_aggregateTrafo277); 
+			char_literal37_tree = (object)adaptor.Create(char_literal37);
+			adaptor.AddChild(root_0, char_literal37_tree);
+			DebugLocation(63, 19);
+			PushFollow(Follow._aggregateExpr_in_aggregateTrafo279);
+			aggregateExpr38=aggregateExpr();
+			PopFollow();
+
+			adaptor.AddChild(root_0, aggregateExpr38.Tree);
+			DebugLocation(63, 33);
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:63:33: ( ',' ! aggregateExpr )*
+			try { DebugEnterSubRule(10);
+			while (true)
+			{
+				int alt10=2;
+				try { DebugEnterDecision(10, false);
+				int LA10_1 = input.LA(1);
+
+				if ((LA10_1==77))
+				{
+					alt10 = 1;
+				}
+
+
+				} finally { DebugExitDecision(10); }
+				switch ( alt10 )
+				{
+				case 1:
+					DebugEnterAlt(1);
+					// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:63:34: ',' ! aggregateExpr
+					{
+					DebugLocation(63, 37);
+					char_literal39=(IToken)Match(input,77,Follow._77_in_aggregateTrafo282); 
+					DebugLocation(63, 39);
+					PushFollow(Follow._aggregateExpr_in_aggregateTrafo285);
+					aggregateExpr40=aggregateExpr();
+					PopFollow();
+
+					adaptor.AddChild(root_0, aggregateExpr40.Tree);
+
+					}
+					break;
+
+				default:
+					goto loop10;
+				}
+			}
+
+			loop10:
 				;
 
-			} finally { DebugExitSubRule(5); }
+			} finally { DebugExitSubRule(10); }
 
+			DebugLocation(63, 54);
+			char_literal41=(IToken)Match(input,76,Follow._76_in_aggregateTrafo288); 
+			char_literal41_tree = (object)adaptor.Create(char_literal41);
+			adaptor.AddChild(root_0, char_literal41_tree);
 
 			}
 
@@ -731,56 +1446,72 @@ private AstParserRuleReturnScope<object, IToken> top()
 		}
 		finally
 		{
-			TraceOut("top", 4);
-			LeaveRule("top", 4);
-			LeaveRule_top();
+			TraceOut("aggregateTrafo", 11);
+			LeaveRule("aggregateTrafo", 11);
+			LeaveRule_aggregateTrafo();
 		}
-		DebugLocation(42, 12);
-		} finally { DebugExitRule(GrammarFileName, "top"); }
+		DebugLocation(63, 56);
+		} finally { DebugExitRule(GrammarFileName, "aggregateTrafo"); }
 		return retval;
 
 	}
-	// $ANTLR end "top"
-
-	partial void EnterRule_filter();
-	partial void LeaveRule_filter();
-	// $ANTLR start "filter"
-	// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:44:1: filter : FILTER ^ filterexpression[false] ;
-	[GrammarRule("filter")]
-	private AstParserRuleReturnScope<object, IToken> filter()
+	// $ANTLR end "aggregateTrafo"
+
+	partial void EnterRule_aggregateExpr();
+	partial void LeaveRule_aggregateExpr();
+	// $ANTLR start "aggregateExpr"
+	// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:65:1: aggregateExpr : propertyname[false] SPACE ! aggregateWith SPACE ! asexp ;
+	[GrammarRule("aggregateExpr")]
+	private AstParserRuleReturnScope<object, IToken> aggregateExpr()
 	{
-		EnterRule_filter();
-		EnterRule("filter", 5);
-		TraceIn("filter", 5);
+		EnterRule_aggregateExpr();
+		EnterRule("aggregateExpr", 12);
+		TraceIn("aggregateExpr", 12);
 		AstParserRuleReturnScope<object, IToken> retval = new AstParserRuleReturnScope<object, IToken>();
 		retval.Start = (IToken)input.LT(1);
 
 		object root_0 = default(object);
 
-		IToken FILTER16 = default(IToken);
-		AstParserRuleReturnScope<object, IToken> filterexpression17 = default(AstParserRuleReturnScope<object, IToken>);
+		IToken SPACE43 = default(IToken);
+		IToken SPACE45 = default(IToken);
+		AstParserRuleReturnScope<object, IToken> propertyname42 = default(AstParserRuleReturnScope<object, IToken>);
+		AstParserRuleReturnScope<object, IToken> aggregateWith44 = default(AstParserRuleReturnScope<object, IToken>);
+		AstParserRuleReturnScope<object, IToken> asexp46 = default(AstParserRuleReturnScope<object, IToken>);
 
-		object FILTER16_tree = default(object);
-		try { DebugEnterRule(GrammarFileName, "filter");
-		DebugLocation(44, 34);
+		object SPACE43_tree = default(object);
+		object SPACE45_tree = default(object);
+		try { DebugEnterRule(GrammarFileName, "aggregateExpr");
+		DebugLocation(65, 56);
 		try
 		{
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:45:2: ( FILTER ^ filterexpression[false] )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:66:2: ( propertyname[false] SPACE ! aggregateWith SPACE ! asexp )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:45:4: FILTER ^ filterexpression[false]
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:66:4: propertyname[false] SPACE ! aggregateWith SPACE ! asexp
 			{
 			root_0 = (object)adaptor.Nil();
 
-			DebugLocation(45, 10);
-			FILTER16=(IToken)Match(input,FILTER,Follow._FILTER_in_filter162); 
-			FILTER16_tree = (object)adaptor.Create(FILTER16);
-			root_0 = (object)adaptor.BecomeRoot(FILTER16_tree, root_0);
-			DebugLocation(45, 12);
-			PushFollow(Follow._filterexpression_in_filter165);
-			filterexpression17=filterexpression(false);
+			DebugLocation(66, 4);
+			PushFollow(Follow._propertyname_in_aggregateExpr297);
+			propertyname42=propertyname(false);
+			PopFollow();
+
+			adaptor.AddChild(root_0, propertyname42.Tree);
+			DebugLocation(66, 29);
+			SPACE43=(IToken)Match(input,SPACE,Follow._SPACE_in_aggregateExpr300); 
+			DebugLocation(66, 31);
+			PushFollow(Follow._aggregateWith_in_aggregateExpr303);
+			aggregateWith44=aggregateWith();
 			PopFollow();
 
-			adaptor.AddChild(root_0, filterexpression17.Tree);
+			adaptor.AddChild(root_0, aggregateWith44.Tree);
+			DebugLocation(66, 50);
+			SPACE45=(IToken)Match(input,SPACE,Follow._SPACE_in_aggregateExpr305); 
+			DebugLocation(66, 52);
+			PushFollow(Follow._asexp_in_aggregateExpr308);
+			asexp46=asexp();
+			PopFollow();
+
+			adaptor.AddChild(root_0, asexp46.Tree);
 
 			}
 
@@ -799,102 +1530,132 @@ private AstParserRuleReturnScope<object, IToken> filter()
 		}
 		finally
 		{
-			TraceOut("filter", 5);
-			LeaveRule("filter", 5);
-			LeaveRule_filter();
+			TraceOut("aggregateExpr", 12);
+			LeaveRule("aggregateExpr", 12);
+			LeaveRule_aggregateExpr();
 		}
-		DebugLocation(45, 34);
-		} finally { DebugExitRule(GrammarFileName, "filter"); }
+		DebugLocation(66, 56);
+		} finally { DebugExitRule(GrammarFileName, "aggregateExpr"); }
 		return retval;
 
 	}
-	// $ANTLR end "filter"
-
-	partial void EnterRule_select();
-	partial void LeaveRule_select();
-	// $ANTLR start "select"
-	// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:47:1: select : SELECT ^ propertyname[false] ( ',' ! propertyname[false] )* ;
-	[GrammarRule("select")]
-	private AstParserRuleReturnScope<object, IToken> select()
+	// $ANTLR end "aggregateExpr"
+
+	partial void EnterRule_aggregateWith();
+	partial void LeaveRule_aggregateWith();
+	// $ANTLR start "aggregateWith"
+	// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:68:1: aggregateWith : WITH ^ SPACE ! aggregateMethod ;
+	[GrammarRule("aggregateWith")]
+	private AstParserRuleReturnScope<object, IToken> aggregateWith()
 	{
-		EnterRule_select();
-		EnterRule("select", 6);
-		TraceIn("select", 6);
+		EnterRule_aggregateWith();
+		EnterRule("aggregateWith", 13);
+		TraceIn("aggregateWith", 13);
 		AstParserRuleReturnScope<object, IToken> retval = new AstParserRuleReturnScope<object, IToken>();
 		retval.Start = (IToken)input.LT(1);
 
 		object root_0 = default(object);
 
-		IToken SELECT18 = default(IToken);
-		IToken char_literal20 = default(IToken);
-		AstParserRuleReturnScope<object, IToken> propertyname19 = default(AstParserRuleReturnScope<object, IToken>);
-		AstParserRuleReturnScope<object, IToken> propertyname21 = default(AstParserRuleReturnScope<object, IToken>);
+		IToken WITH47 = default(IToken);
+		IToken SPACE48 = default(IToken);
+		AstParserRuleReturnScope<object, IToken> aggregateMethod49 = default(AstParserRuleReturnScope<object, IToken>);
 
-		object SELECT18_tree = default(object);
-		object char_literal20_tree = default(object);
-		try { DebugEnterRule(GrammarFileName, "select");
-		DebugLocation(47, 58);
+		object WITH47_tree = default(object);
+		object SPACE48_tree = default(object);
+		try { DebugEnterRule(GrammarFileName, "aggregateWith");
+		DebugLocation(68, 31);
 		try
 		{
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:48:2: ( SELECT ^ propertyname[false] ( ',' ! propertyname[false] )* )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:69:2: ( WITH ^ SPACE ! aggregateMethod )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:48:4: SELECT ^ propertyname[false] ( ',' ! propertyname[false] )*
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:69:4: WITH ^ SPACE ! aggregateMethod
 			{
 			root_0 = (object)adaptor.Nil();
 
-			DebugLocation(48, 10);
-			SELECT18=(IToken)Match(input,SELECT,Follow._SELECT_in_select176); 
-			SELECT18_tree = (object)adaptor.Create(SELECT18);
-			root_0 = (object)adaptor.BecomeRoot(SELECT18_tree, root_0);
-			DebugLocation(48, 12);
-			PushFollow(Follow._propertyname_in_select179);
-			propertyname19=propertyname(false);
+			DebugLocation(69, 8);
+			WITH47=(IToken)Match(input,WITH,Follow._WITH_in_aggregateWith318); 
+			WITH47_tree = (object)adaptor.Create(WITH47);
+			root_0 = (object)adaptor.BecomeRoot(WITH47_tree, root_0);
+			DebugLocation(69, 15);
+			SPACE48=(IToken)Match(input,SPACE,Follow._SPACE_in_aggregateWith321); 
+			DebugLocation(69, 17);
+			PushFollow(Follow._aggregateMethod_in_aggregateWith324);
+			aggregateMethod49=aggregateMethod();
 			PopFollow();
 
-			adaptor.AddChild(root_0, propertyname19.Tree);
-			DebugLocation(48, 32);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:48:32: ( ',' ! propertyname[false] )*
-			try { DebugEnterSubRule(6);
-			while (true)
-			{
-				int alt6=2;
-				try { DebugEnterDecision(6, false);
-				int LA6_1 = input.LA(1);
+			adaptor.AddChild(root_0, aggregateMethod49.Tree);
 
-				if ((LA6_1==73))
-				{
-					alt6 = 1;
-				}
+			}
+
+			retval.Stop = (IToken)input.LT(-1);
 
+			retval.Tree = (object)adaptor.RulePostProcessing(root_0);
+			adaptor.SetTokenBoundaries(retval.Tree, retval.Start, retval.Stop);
 
-				} finally { DebugExitDecision(6); }
-				switch ( alt6 )
-				{
-				case 1:
-					DebugEnterAlt(1);
-					// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:48:33: ',' ! propertyname[false]
-					{
-					DebugLocation(48, 36);
-					char_literal20=(IToken)Match(input,73,Follow._73_in_select183); 
-					DebugLocation(48, 38);
-					PushFollow(Follow._propertyname_in_select186);
-					propertyname21=propertyname(false);
-					PopFollow();
+		}
+		catch (RecognitionException re)
+		{
+			ReportError(re);
+			Recover(input,re);
+			retval.Tree = (object)adaptor.ErrorNode(input, retval.Start, input.LT(-1), re);
 
-					adaptor.AddChild(root_0, propertyname21.Tree);
+		}
+		finally
+		{
+			TraceOut("aggregateWith", 13);
+			LeaveRule("aggregateWith", 13);
+			LeaveRule_aggregateWith();
+		}
+		DebugLocation(69, 31);
+		} finally { DebugExitRule(GrammarFileName, "aggregateWith"); }
+		return retval;
 
-					}
-					break;
+	}
+	// $ANTLR end "aggregateWith"
+
+	partial void EnterRule_aggregateMethod();
+	partial void LeaveRule_aggregateMethod();
+	// $ANTLR start "aggregateMethod"
+	// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:71:1: aggregateMethod : ( MAX | MIN | SUM | AVERAGE );
+	[GrammarRule("aggregateMethod")]
+	private AstParserRuleReturnScope<object, IToken> aggregateMethod()
+	{
+		EnterRule_aggregateMethod();
+		EnterRule("aggregateMethod", 14);
+		TraceIn("aggregateMethod", 14);
+		AstParserRuleReturnScope<object, IToken> retval = new AstParserRuleReturnScope<object, IToken>();
+		retval.Start = (IToken)input.LT(1);
 
-				default:
-					goto loop6;
-				}
-			}
+		object root_0 = default(object);
 
-			loop6:
-				;
+		IToken set50 = default(IToken);
 
-			} finally { DebugExitSubRule(6); }
+		object set50_tree = default(object);
+		try { DebugEnterRule(GrammarFileName, "aggregateMethod");
+		DebugLocation(71, 28);
+		try
+		{
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:72:2: ( MAX | MIN | SUM | AVERAGE )
+			DebugEnterAlt(1);
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:
+			{
+			root_0 = (object)adaptor.Nil();
+
+			DebugLocation(72, 2);
+
+			set50=(IToken)input.LT(1);
+			if (input.LA(1)==AVERAGE||(input.LA(1)>=MAX && input.LA(1)<=MIN)||input.LA(1)==SUM)
+			{
+				input.Consume();
+				adaptor.AddChild(root_0, (object)adaptor.Create(set50));
+				state.errorRecovery=false;
+			}
+			else
+			{
+				MismatchedSetException mse = new MismatchedSetException(null,input);
+				DebugRecognitionException(mse);
+				throw mse;
+			}
 
 
 			}
@@ -914,102 +1675,102 @@ private AstParserRuleReturnScope<object, IToken> select()
 		}
 		finally
 		{
-			TraceOut("select", 6);
-			LeaveRule("select", 6);
-			LeaveRule_select();
+			TraceOut("aggregateMethod", 14);
+			LeaveRule("aggregateMethod", 14);
+			LeaveRule_aggregateMethod();
 		}
-		DebugLocation(48, 58);
-		} finally { DebugExitRule(GrammarFileName, "select"); }
+		DebugLocation(72, 28);
+		} finally { DebugExitRule(GrammarFileName, "aggregateMethod"); }
 		return retval;
 
 	}
-	// $ANTLR end "select"
+	// $ANTLR end "aggregateMethod"
 
 	partial void EnterRule_expand();
 	partial void LeaveRule_expand();
 	// $ANTLR start "expand"
-	// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:50:1: expand : EXPAND ^ propertyname[false] ( ',' ! propertyname[false] )* ;
+	// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:74:1: expand : EXPAND ^ propertyname[false] ( ',' ! propertyname[false] )* ;
 	[GrammarRule("expand")]
 	private AstParserRuleReturnScope<object, IToken> expand()
 	{
 		EnterRule_expand();
-		EnterRule("expand", 7);
-		TraceIn("expand", 7);
+		EnterRule("expand", 15);
+		TraceIn("expand", 15);
 		AstParserRuleReturnScope<object, IToken> retval = new AstParserRuleReturnScope<object, IToken>();
 		retval.Start = (IToken)input.LT(1);
 
 		object root_0 = default(object);
 
-		IToken EXPAND22 = default(IToken);
-		IToken char_literal24 = default(IToken);
-		AstParserRuleReturnScope<object, IToken> propertyname23 = default(AstParserRuleReturnScope<object, IToken>);
-		AstParserRuleReturnScope<object, IToken> propertyname25 = default(AstParserRuleReturnScope<object, IToken>);
+		IToken EXPAND51 = default(IToken);
+		IToken char_literal53 = default(IToken);
+		AstParserRuleReturnScope<object, IToken> propertyname52 = default(AstParserRuleReturnScope<object, IToken>);
+		AstParserRuleReturnScope<object, IToken> propertyname54 = default(AstParserRuleReturnScope<object, IToken>);
 
-		object EXPAND22_tree = default(object);
-		object char_literal24_tree = default(object);
+		object EXPAND51_tree = default(object);
+		object char_literal53_tree = default(object);
 		try { DebugEnterRule(GrammarFileName, "expand");
-		DebugLocation(50, 58);
+		DebugLocation(74, 58);
 		try
 		{
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:51:2: ( EXPAND ^ propertyname[false] ( ',' ! propertyname[false] )* )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:75:2: ( EXPAND ^ propertyname[false] ( ',' ! propertyname[false] )* )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:51:4: EXPAND ^ propertyname[false] ( ',' ! propertyname[false] )*
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:75:4: EXPAND ^ propertyname[false] ( ',' ! propertyname[false] )*
 			{
 			root_0 = (object)adaptor.Nil();
 
-			DebugLocation(51, 10);
-			EXPAND22=(IToken)Match(input,EXPAND,Follow._EXPAND_in_expand201); 
-			EXPAND22_tree = (object)adaptor.Create(EXPAND22);
-			root_0 = (object)adaptor.BecomeRoot(EXPAND22_tree, root_0);
-			DebugLocation(51, 12);
-			PushFollow(Follow._propertyname_in_expand204);
-			propertyname23=propertyname(false);
+			DebugLocation(75, 10);
+			EXPAND51=(IToken)Match(input,EXPAND,Follow._EXPAND_in_expand354); 
+			EXPAND51_tree = (object)adaptor.Create(EXPAND51);
+			root_0 = (object)adaptor.BecomeRoot(EXPAND51_tree, root_0);
+			DebugLocation(75, 12);
+			PushFollow(Follow._propertyname_in_expand357);
+			propertyname52=propertyname(false);
 			PopFollow();
 
-			adaptor.AddChild(root_0, propertyname23.Tree);
-			DebugLocation(51, 32);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:51:32: ( ',' ! propertyname[false] )*
-			try { DebugEnterSubRule(7);
+			adaptor.AddChild(root_0, propertyname52.Tree);
+			DebugLocation(75, 32);
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:75:32: ( ',' ! propertyname[false] )*
+			try { DebugEnterSubRule(11);
 			while (true)
 			{
-				int alt7=2;
-				try { DebugEnterDecision(7, false);
-				int LA7_1 = input.LA(1);
+				int alt11=2;
+				try { DebugEnterDecision(11, false);
+				int LA11_1 = input.LA(1);
 
-				if ((LA7_1==73))
+				if ((LA11_1==77))
 				{
-					alt7 = 1;
+					alt11 = 1;
 				}
 
 
-				} finally { DebugExitDecision(7); }
-				switch ( alt7 )
+				} finally { DebugExitDecision(11); }
+				switch ( alt11 )
 				{
 				case 1:
 					DebugEnterAlt(1);
-					// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:51:33: ',' ! propertyname[false]
+					// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:75:33: ',' ! propertyname[false]
 					{
-					DebugLocation(51, 36);
-					char_literal24=(IToken)Match(input,73,Follow._73_in_expand208); 
-					DebugLocation(51, 38);
-					PushFollow(Follow._propertyname_in_expand211);
-					propertyname25=propertyname(false);
+					DebugLocation(75, 36);
+					char_literal53=(IToken)Match(input,77,Follow._77_in_expand361); 
+					DebugLocation(75, 38);
+					PushFollow(Follow._propertyname_in_expand364);
+					propertyname54=propertyname(false);
 					PopFollow();
 
-					adaptor.AddChild(root_0, propertyname25.Tree);
+					adaptor.AddChild(root_0, propertyname54.Tree);
 
 					}
 					break;
 
 				default:
-					goto loop7;
+					goto loop11;
 				}
 			}
 
-			loop7:
+			loop11:
 				;
 
-			} finally { DebugExitSubRule(7); }
+			} finally { DebugExitSubRule(11); }
 
 
 			}
@@ -1029,11 +1790,11 @@ private AstParserRuleReturnScope<object, IToken> expand()
 		}
 		finally
 		{
-			TraceOut("expand", 7);
-			LeaveRule("expand", 7);
+			TraceOut("expand", 15);
+			LeaveRule("expand", 15);
 			LeaveRule_expand();
 		}
-		DebugLocation(51, 58);
+		DebugLocation(75, 58);
 		} finally { DebugExitRule(GrammarFileName, "expand"); }
 		return retval;
 
@@ -1043,94 +1804,94 @@ private AstParserRuleReturnScope<object, IToken> expand()
 	partial void EnterRule_inlinecount();
 	partial void LeaveRule_inlinecount();
 	// $ANTLR start "inlinecount"
-	// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:53:1: inlinecount : ( INLINECOUNT ^ ALLPAGES | INLINECOUNT NONE ->);
+	// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:77:1: inlinecount : ( INLINECOUNT ^ ALLPAGES | INLINECOUNT NONE ->);
 	[GrammarRule("inlinecount")]
 	private AstParserRuleReturnScope<object, IToken> inlinecount()
 	{
 		EnterRule_inlinecount();
-		EnterRule("inlinecount", 8);
-		TraceIn("inlinecount", 8);
+		EnterRule("inlinecount", 16);
+		TraceIn("inlinecount", 16);
 		AstParserRuleReturnScope<object, IToken> retval = new AstParserRuleReturnScope<object, IToken>();
 		retval.Start = (IToken)input.LT(1);
 
 		object root_0 = default(object);
 
-		IToken INLINECOUNT26 = default(IToken);
-		IToken ALLPAGES27 = default(IToken);
-		IToken INLINECOUNT28 = default(IToken);
-		IToken NONE29 = default(IToken);
+		IToken INLINECOUNT55 = default(IToken);
+		IToken ALLPAGES56 = default(IToken);
+		IToken INLINECOUNT57 = default(IToken);
+		IToken NONE58 = default(IToken);
 
-		object INLINECOUNT26_tree = default(object);
-		object ALLPAGES27_tree = default(object);
-		object INLINECOUNT28_tree = default(object);
-		object NONE29_tree = default(object);
+		object INLINECOUNT55_tree = default(object);
+		object ALLPAGES56_tree = default(object);
+		object INLINECOUNT57_tree = default(object);
+		object NONE58_tree = default(object);
 		RewriteRuleITokenStream stream_INLINECOUNT=new RewriteRuleITokenStream(adaptor,"token INLINECOUNT");
 		RewriteRuleITokenStream stream_NONE=new RewriteRuleITokenStream(adaptor,"token NONE");
 		try { DebugEnterRule(GrammarFileName, "inlinecount");
-		DebugLocation(53, 22);
+		DebugLocation(77, 22);
 		try
 		{
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:54:2: ( INLINECOUNT ^ ALLPAGES | INLINECOUNT NONE ->)
-			int alt8=2;
-			try { DebugEnterDecision(8, false);
-			int LA8_1 = input.LA(1);
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:78:2: ( INLINECOUNT ^ ALLPAGES | INLINECOUNT NONE ->)
+			int alt12=2;
+			try { DebugEnterDecision(12, false);
+			int LA12_1 = input.LA(1);
 
-			if ((LA8_1==INLINECOUNT))
+			if ((LA12_1==INLINECOUNT))
 			{
-				int LA8_2 = input.LA(2);
+				int LA12_2 = input.LA(2);
 
-				if ((LA8_2==ALLPAGES))
+				if ((LA12_2==ALLPAGES))
 				{
-					alt8 = 1;
+					alt12 = 1;
 				}
-				else if ((LA8_2==NONE))
+				else if ((LA12_2==NONE))
 				{
-					alt8 = 2;
+					alt12 = 2;
 				}
 				else
 				{
-					NoViableAltException nvae = new NoViableAltException("", 8, 1, input, 2);
+					NoViableAltException nvae = new NoViableAltException("", 12, 1, input, 2);
 					DebugRecognitionException(nvae);
 					throw nvae;
 				}
 			}
 			else
 			{
-				NoViableAltException nvae = new NoViableAltException("", 8, 0, input, 1);
+				NoViableAltException nvae = new NoViableAltException("", 12, 0, input, 1);
 				DebugRecognitionException(nvae);
 				throw nvae;
 			}
-			} finally { DebugExitDecision(8); }
-			switch (alt8)
+			} finally { DebugExitDecision(12); }
+			switch (alt12)
 			{
 			case 1:
 				DebugEnterAlt(1);
-				// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:54:4: INLINECOUNT ^ ALLPAGES
+				// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:78:4: INLINECOUNT ^ ALLPAGES
 				{
 				root_0 = (object)adaptor.Nil();
 
-				DebugLocation(54, 15);
-				INLINECOUNT26=(IToken)Match(input,INLINECOUNT,Follow._INLINECOUNT_in_inlinecount223); 
-				INLINECOUNT26_tree = (object)adaptor.Create(INLINECOUNT26);
-				root_0 = (object)adaptor.BecomeRoot(INLINECOUNT26_tree, root_0);
-				DebugLocation(54, 17);
-				ALLPAGES27=(IToken)Match(input,ALLPAGES,Follow._ALLPAGES_in_inlinecount226); 
-				ALLPAGES27_tree = (object)adaptor.Create(ALLPAGES27);
-				adaptor.AddChild(root_0, ALLPAGES27_tree);
+				DebugLocation(78, 15);
+				INLINECOUNT55=(IToken)Match(input,INLINECOUNT,Follow._INLINECOUNT_in_inlinecount376); 
+				INLINECOUNT55_tree = (object)adaptor.Create(INLINECOUNT55);
+				root_0 = (object)adaptor.BecomeRoot(INLINECOUNT55_tree, root_0);
+				DebugLocation(78, 17);
+				ALLPAGES56=(IToken)Match(input,ALLPAGES,Follow._ALLPAGES_in_inlinecount379); 
+				ALLPAGES56_tree = (object)adaptor.Create(ALLPAGES56);
+				adaptor.AddChild(root_0, ALLPAGES56_tree);
 
 				}
 				break;
 			case 2:
 				DebugEnterAlt(2);
-				// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:55:4: INLINECOUNT NONE
+				// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:79:4: INLINECOUNT NONE
 				{
-				DebugLocation(55, 4);
-				INLINECOUNT28=(IToken)Match(input,INLINECOUNT,Follow._INLINECOUNT_in_inlinecount231);  
-				stream_INLINECOUNT.Add(INLINECOUNT28);
+				DebugLocation(79, 4);
+				INLINECOUNT57=(IToken)Match(input,INLINECOUNT,Follow._INLINECOUNT_in_inlinecount384);  
+				stream_INLINECOUNT.Add(INLINECOUNT57);
 
-				DebugLocation(55, 16);
-				NONE29=(IToken)Match(input,NONE,Follow._NONE_in_inlinecount233);  
-				stream_NONE.Add(NONE29);
+				DebugLocation(79, 16);
+				NONE58=(IToken)Match(input,NONE,Follow._NONE_in_inlinecount386);  
+				stream_NONE.Add(NONE58);
 
 
 
@@ -1146,9 +1907,9 @@ private AstParserRuleReturnScope<object, IToken> inlinecount()
 				RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.Tree:null);
 
 				root_0 = (object)adaptor.Nil();
-				// 55:21: ->
+				// 79:21: ->
 				{
-					DebugLocation(55, 23);
+					DebugLocation(79, 23);
 					root_0 = null;
 				}
 
@@ -1174,11 +1935,11 @@ private AstParserRuleReturnScope<object, IToken> inlinecount()
 		}
 		finally
 		{
-			TraceOut("inlinecount", 8);
-			LeaveRule("inlinecount", 8);
+			TraceOut("inlinecount", 16);
+			LeaveRule("inlinecount", 16);
 			LeaveRule_inlinecount();
 		}
-		DebugLocation(55, 22);
+		DebugLocation(79, 22);
 		} finally { DebugExitRule(GrammarFileName, "inlinecount"); }
 		return retval;
 
@@ -1188,40 +1949,40 @@ private AstParserRuleReturnScope<object, IToken> inlinecount()
 	partial void EnterRule_ignored();
 	partial void LeaveRule_ignored();
 	// $ANTLR start "ignored"
-	// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:57:1: ignored : IGNORED IDENTIFIER -> IGNORED ;
+	// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:81:1: ignored : IGNORED IDENTIFIER -> IGNORED ;
 	[GrammarRule("ignored")]
 	private AstParserRuleReturnScope<object, IToken> ignored()
 	{
 		EnterRule_ignored();
-		EnterRule("ignored", 9);
-		TraceIn("ignored", 9);
+		EnterRule("ignored", 17);
+		TraceIn("ignored", 17);
 		AstParserRuleReturnScope<object, IToken> retval = new AstParserRuleReturnScope<object, IToken>();
 		retval.Start = (IToken)input.LT(1);
 
 		object root_0 = default(object);
 
-		IToken IGNORED30 = default(IToken);
-		IToken IDENTIFIER31 = default(IToken);
+		IToken IGNORED59 = default(IToken);
+		IToken IDENTIFIER60 = default(IToken);
 
-		object IGNORED30_tree = default(object);
-		object IDENTIFIER31_tree = default(object);
+		object IGNORED59_tree = default(object);
+		object IDENTIFIER60_tree = default(object);
 		RewriteRuleITokenStream stream_IGNORED=new RewriteRuleITokenStream(adaptor,"token IGNORED");
 		RewriteRuleITokenStream stream_IDENTIFIER=new RewriteRuleITokenStream(adaptor,"token IDENTIFIER");
 		try { DebugEnterRule(GrammarFileName, "ignored");
-		DebugLocation(57, 39);
+		DebugLocation(81, 39);
 		try
 		{
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:57:9: ( IGNORED IDENTIFIER -> IGNORED )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:81:9: ( IGNORED IDENTIFIER -> IGNORED )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:57:11: IGNORED IDENTIFIER
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:81:11: IGNORED IDENTIFIER
 			{
-			DebugLocation(57, 11);
-			IGNORED30=(IToken)Match(input,IGNORED,Follow._IGNORED_in_ignored243);  
-			stream_IGNORED.Add(IGNORED30);
+			DebugLocation(81, 11);
+			IGNORED59=(IToken)Match(input,IGNORED,Follow._IGNORED_in_ignored396);  
+			stream_IGNORED.Add(IGNORED59);
 
-			DebugLocation(57, 19);
-			IDENTIFIER31=(IToken)Match(input,IDENTIFIER,Follow._IDENTIFIER_in_ignored245);  
-			stream_IDENTIFIER.Add(IDENTIFIER31);
+			DebugLocation(81, 19);
+			IDENTIFIER60=(IToken)Match(input,IDENTIFIER,Follow._IDENTIFIER_in_ignored398);  
+			stream_IDENTIFIER.Add(IDENTIFIER60);
 
 
 
@@ -1237,9 +1998,9 @@ private AstParserRuleReturnScope<object, IToken> ignored()
 			RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.Tree:null);
 
 			root_0 = (object)adaptor.Nil();
-			// 57:30: -> IGNORED
+			// 81:30: -> IGNORED
 			{
-				DebugLocation(57, 33);
+				DebugLocation(81, 33);
 				adaptor.AddChild(root_0, stream_IGNORED.NextNode());
 
 			}
@@ -1264,11 +2025,11 @@ private AstParserRuleReturnScope<object, IToken> ignored()
 		}
 		finally
 		{
-			TraceOut("ignored", 9);
-			LeaveRule("ignored", 9);
+			TraceOut("ignored", 17);
+			LeaveRule("ignored", 17);
 			LeaveRule_ignored();
 		}
-		DebugLocation(57, 39);
+		DebugLocation(81, 39);
 		} finally { DebugExitRule(GrammarFileName, "ignored"); }
 		return retval;
 
@@ -1278,92 +2039,92 @@ private AstParserRuleReturnScope<object, IToken> ignored()
 	partial void EnterRule_filterexpression();
 	partial void LeaveRule_filterexpression();
 	// $ANTLR start "filterexpression"
-	// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:59:1: filterexpression[bool subquery] : orexpression[subquery] ( SPACE ! OR ^ SPACE ! orexpression[subquery] )* ;
+	// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:83:1: filterexpression[bool subquery] : orexpression[subquery] ( SPACE ! OR ^ SPACE ! orexpression[subquery] )* ;
 	[GrammarRule("filterexpression")]
 	private AstParserRuleReturnScope<object, IToken> filterexpression(bool subquery)
 	{
 		EnterRule_filterexpression();
-		EnterRule("filterexpression", 10);
-		TraceIn("filterexpression", 10);
+		EnterRule("filterexpression", 18);
+		TraceIn("filterexpression", 18);
 		AstParserRuleReturnScope<object, IToken> retval = new AstParserRuleReturnScope<object, IToken>();
 		retval.Start = (IToken)input.LT(1);
 
 		object root_0 = default(object);
 
-		IToken SPACE33 = default(IToken);
-		IToken OR34 = default(IToken);
-		IToken SPACE35 = default(IToken);
-		AstParserRuleReturnScope<object, IToken> orexpression32 = default(AstParserRuleReturnScope<object, IToken>);
-		AstParserRuleReturnScope<object, IToken> orexpression36 = default(AstParserRuleReturnScope<object, IToken>);
+		IToken SPACE62 = default(IToken);
+		IToken OR63 = default(IToken);
+		IToken SPACE64 = default(IToken);
+		AstParserRuleReturnScope<object, IToken> orexpression61 = default(AstParserRuleReturnScope<object, IToken>);
+		AstParserRuleReturnScope<object, IToken> orexpression65 = default(AstParserRuleReturnScope<object, IToken>);
 
-		object SPACE33_tree = default(object);
-		object OR34_tree = default(object);
-		object SPACE35_tree = default(object);
+		object SPACE62_tree = default(object);
+		object OR63_tree = default(object);
+		object SPACE64_tree = default(object);
 		try { DebugEnterRule(GrammarFileName, "filterexpression");
-		DebugLocation(59, 69);
+		DebugLocation(83, 69);
 		try
 		{
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:60:2: ( orexpression[subquery] ( SPACE ! OR ^ SPACE ! orexpression[subquery] )* )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:84:2: ( orexpression[subquery] ( SPACE ! OR ^ SPACE ! orexpression[subquery] )* )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:60:4: orexpression[subquery] ( SPACE ! OR ^ SPACE ! orexpression[subquery] )*
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:84:4: orexpression[subquery] ( SPACE ! OR ^ SPACE ! orexpression[subquery] )*
 			{
 			root_0 = (object)adaptor.Nil();
 
-			DebugLocation(60, 4);
-			PushFollow(Follow._orexpression_in_filterexpression259);
-			orexpression32=orexpression(subquery);
+			DebugLocation(84, 4);
+			PushFollow(Follow._orexpression_in_filterexpression412);
+			orexpression61=orexpression(subquery);
 			PopFollow();
 
-			adaptor.AddChild(root_0, orexpression32.Tree);
-			DebugLocation(60, 27);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:60:27: ( SPACE ! OR ^ SPACE ! orexpression[subquery] )*
-			try { DebugEnterSubRule(9);
+			adaptor.AddChild(root_0, orexpression61.Tree);
+			DebugLocation(84, 27);
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:84:27: ( SPACE ! OR ^ SPACE ! orexpression[subquery] )*
+			try { DebugEnterSubRule(13);
 			while (true)
 			{
-				int alt9=2;
-				try { DebugEnterDecision(9, false);
-				int LA9_1 = input.LA(1);
+				int alt13=2;
+				try { DebugEnterDecision(13, false);
+				int LA13_1 = input.LA(1);
 
-				if ((LA9_1==SPACE))
+				if ((LA13_1==SPACE))
 				{
-					alt9 = 1;
+					alt13 = 1;
 				}
 
 
-				} finally { DebugExitDecision(9); }
-				switch ( alt9 )
+				} finally { DebugExitDecision(13); }
+				switch ( alt13 )
 				{
 				case 1:
 					DebugEnterAlt(1);
-					// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:60:28: SPACE ! OR ^ SPACE ! orexpression[subquery]
+					// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:84:28: SPACE ! OR ^ SPACE ! orexpression[subquery]
 					{
-					DebugLocation(60, 33);
-					SPACE33=(IToken)Match(input,SPACE,Follow._SPACE_in_filterexpression263); 
-					DebugLocation(60, 37);
-					OR34=(IToken)Match(input,OR,Follow._OR_in_filterexpression266); 
-					OR34_tree = (object)adaptor.Create(OR34);
-					root_0 = (object)adaptor.BecomeRoot(OR34_tree, root_0);
-					DebugLocation(60, 44);
-					SPACE35=(IToken)Match(input,SPACE,Follow._SPACE_in_filterexpression269); 
-					DebugLocation(60, 46);
-					PushFollow(Follow._orexpression_in_filterexpression272);
-					orexpression36=orexpression(subquery);
+					DebugLocation(84, 33);
+					SPACE62=(IToken)Match(input,SPACE,Follow._SPACE_in_filterexpression416); 
+					DebugLocation(84, 37);
+					OR63=(IToken)Match(input,OR,Follow._OR_in_filterexpression419); 
+					OR63_tree = (object)adaptor.Create(OR63);
+					root_0 = (object)adaptor.BecomeRoot(OR63_tree, root_0);
+					DebugLocation(84, 44);
+					SPACE64=(IToken)Match(input,SPACE,Follow._SPACE_in_filterexpression422); 
+					DebugLocation(84, 46);
+					PushFollow(Follow._orexpression_in_filterexpression425);
+					orexpression65=orexpression(subquery);
 					PopFollow();
 
-					adaptor.AddChild(root_0, orexpression36.Tree);
+					adaptor.AddChild(root_0, orexpression65.Tree);
 
 					}
 					break;
 
 				default:
-					goto loop9;
+					goto loop13;
 				}
 			}
 
-			loop9:
+			loop13:
 				;
 
-			} finally { DebugExitSubRule(9); }
+			} finally { DebugExitSubRule(13); }
 
 
 			}
@@ -1383,11 +2144,11 @@ private AstParserRuleReturnScope<object, IToken> filterexpression(bool subquery)
 		}
 		finally
 		{
-			TraceOut("filterexpression", 10);
-			LeaveRule("filterexpression", 10);
+			TraceOut("filterexpression", 18);
+			LeaveRule("filterexpression", 18);
 			LeaveRule_filterexpression();
 		}
-		DebugLocation(60, 69);
+		DebugLocation(84, 69);
 		} finally { DebugExitRule(GrammarFileName, "filterexpression"); }
 		return retval;
 
@@ -1397,99 +2158,99 @@ private AstParserRuleReturnScope<object, IToken> filterexpression(bool subquery)
 	partial void EnterRule_orexpression();
 	partial void LeaveRule_orexpression();
 	// $ANTLR start "orexpression"
-	// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:62:1: orexpression[bool subquery] : andexpression[subquery] ( SPACE ! AND ^ SPACE ! andexpression[subquery] )* ;
+	// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:86:1: orexpression[bool subquery] : andexpression[subquery] ( SPACE ! AND ^ SPACE ! andexpression[subquery] )* ;
 	[GrammarRule("orexpression")]
 	private AstParserRuleReturnScope<object, IToken> orexpression(bool subquery)
 	{
 		EnterRule_orexpression();
-		EnterRule("orexpression", 11);
-		TraceIn("orexpression", 11);
+		EnterRule("orexpression", 19);
+		TraceIn("orexpression", 19);
 		AstParserRuleReturnScope<object, IToken> retval = new AstParserRuleReturnScope<object, IToken>();
 		retval.Start = (IToken)input.LT(1);
 
 		object root_0 = default(object);
 
-		IToken SPACE38 = default(IToken);
-		IToken AND39 = default(IToken);
-		IToken SPACE40 = default(IToken);
-		AstParserRuleReturnScope<object, IToken> andexpression37 = default(AstParserRuleReturnScope<object, IToken>);
-		AstParserRuleReturnScope<object, IToken> andexpression41 = default(AstParserRuleReturnScope<object, IToken>);
+		IToken SPACE67 = default(IToken);
+		IToken AND68 = default(IToken);
+		IToken SPACE69 = default(IToken);
+		AstParserRuleReturnScope<object, IToken> andexpression66 = default(AstParserRuleReturnScope<object, IToken>);
+		AstParserRuleReturnScope<object, IToken> andexpression70 = default(AstParserRuleReturnScope<object, IToken>);
 
-		object SPACE38_tree = default(object);
-		object AND39_tree = default(object);
-		object SPACE40_tree = default(object);
+		object SPACE67_tree = default(object);
+		object AND68_tree = default(object);
+		object SPACE69_tree = default(object);
 		try { DebugEnterRule(GrammarFileName, "orexpression");
-		DebugLocation(62, 72);
+		DebugLocation(86, 72);
 		try
 		{
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:63:2: ( andexpression[subquery] ( SPACE ! AND ^ SPACE ! andexpression[subquery] )* )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:87:2: ( andexpression[subquery] ( SPACE ! AND ^ SPACE ! andexpression[subquery] )* )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:63:4: andexpression[subquery] ( SPACE ! AND ^ SPACE ! andexpression[subquery] )*
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:87:4: andexpression[subquery] ( SPACE ! AND ^ SPACE ! andexpression[subquery] )*
 			{
 			root_0 = (object)adaptor.Nil();
 
-			DebugLocation(63, 4);
-			PushFollow(Follow._andexpression_in_orexpression286);
-			andexpression37=andexpression(subquery);
+			DebugLocation(87, 4);
+			PushFollow(Follow._andexpression_in_orexpression439);
+			andexpression66=andexpression(subquery);
 			PopFollow();
 
-			adaptor.AddChild(root_0, andexpression37.Tree);
-			DebugLocation(63, 28);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:63:28: ( SPACE ! AND ^ SPACE ! andexpression[subquery] )*
-			try { DebugEnterSubRule(10);
+			adaptor.AddChild(root_0, andexpression66.Tree);
+			DebugLocation(87, 28);
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:87:28: ( SPACE ! AND ^ SPACE ! andexpression[subquery] )*
+			try { DebugEnterSubRule(14);
 			while (true)
 			{
-				int alt10=2;
-				try { DebugEnterDecision(10, false);
-				int LA10_1 = input.LA(1);
+				int alt14=2;
+				try { DebugEnterDecision(14, false);
+				int LA14_1 = input.LA(1);
 
-				if ((LA10_1==SPACE))
+				if ((LA14_1==SPACE))
 				{
-					int LA10_2 = input.LA(2);
+					int LA14_2 = input.LA(2);
 
-					if ((LA10_2==AND))
+					if ((LA14_2==AND))
 					{
-						alt10 = 1;
+						alt14 = 1;
 					}
 
 
 				}
 
 
-				} finally { DebugExitDecision(10); }
-				switch ( alt10 )
+				} finally { DebugExitDecision(14); }
+				switch ( alt14 )
 				{
 				case 1:
 					DebugEnterAlt(1);
-					// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:63:29: SPACE ! AND ^ SPACE ! andexpression[subquery]
+					// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:87:29: SPACE ! AND ^ SPACE ! andexpression[subquery]
 					{
-					DebugLocation(63, 34);
-					SPACE38=(IToken)Match(input,SPACE,Follow._SPACE_in_orexpression290); 
-					DebugLocation(63, 39);
-					AND39=(IToken)Match(input,AND,Follow._AND_in_orexpression293); 
-					AND39_tree = (object)adaptor.Create(AND39);
-					root_0 = (object)adaptor.BecomeRoot(AND39_tree, root_0);
-					DebugLocation(63, 46);
-					SPACE40=(IToken)Match(input,SPACE,Follow._SPACE_in_orexpression296); 
-					DebugLocation(63, 48);
-					PushFollow(Follow._andexpression_in_orexpression299);
-					andexpression41=andexpression(subquery);
+					DebugLocation(87, 34);
+					SPACE67=(IToken)Match(input,SPACE,Follow._SPACE_in_orexpression443); 
+					DebugLocation(87, 39);
+					AND68=(IToken)Match(input,AND,Follow._AND_in_orexpression446); 
+					AND68_tree = (object)adaptor.Create(AND68);
+					root_0 = (object)adaptor.BecomeRoot(AND68_tree, root_0);
+					DebugLocation(87, 46);
+					SPACE69=(IToken)Match(input,SPACE,Follow._SPACE_in_orexpression449); 
+					DebugLocation(87, 48);
+					PushFollow(Follow._andexpression_in_orexpression452);
+					andexpression70=andexpression(subquery);
 					PopFollow();
 
-					adaptor.AddChild(root_0, andexpression41.Tree);
+					adaptor.AddChild(root_0, andexpression70.Tree);
 
 					}
 					break;
 
 				default:
-					goto loop10;
+					goto loop14;
 				}
 			}
 
-			loop10:
+			loop14:
 				;
 
-			} finally { DebugExitSubRule(10); }
+			} finally { DebugExitSubRule(14); }
 
 
 			}
@@ -1509,11 +2270,11 @@ private AstParserRuleReturnScope<object, IToken> orexpression(bool subquery)
 		}
 		finally
 		{
-			TraceOut("orexpression", 11);
-			LeaveRule("orexpression", 11);
+			TraceOut("orexpression", 19);
+			LeaveRule("orexpression", 19);
 			LeaveRule_orexpression();
 		}
-		DebugLocation(63, 72);
+		DebugLocation(87, 72);
 		} finally { DebugExitRule(GrammarFileName, "orexpression"); }
 		return retval;
 
@@ -1523,207 +2284,207 @@ private AstParserRuleReturnScope<object, IToken> orexpression(bool subquery)
 	partial void EnterRule_andexpression();
 	partial void LeaveRule_andexpression();
 	// $ANTLR start "andexpression"
-	// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:65:1: andexpression[bool subquery] : ( NOT ^ SPACE ( '(' filterexpression[subquery] ')' | booleanexpression[subquery] ) | ( '(' filterexpression[subquery] ')' | booleanexpression[subquery] ) );
+	// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:89:1: andexpression[bool subquery] : ( NOT ^ SPACE ( '(' filterexpression[subquery] ')' | booleanexpression[subquery] ) | ( '(' filterexpression[subquery] ')' | booleanexpression[subquery] ) );
 	[GrammarRule("andexpression")]
 	private AstParserRuleReturnScope<object, IToken> andexpression(bool subquery)
 	{
 		EnterRule_andexpression();
-		EnterRule("andexpression", 12);
-		TraceIn("andexpression", 12);
+		EnterRule("andexpression", 20);
+		TraceIn("andexpression", 20);
 		AstParserRuleReturnScope<object, IToken> retval = new AstParserRuleReturnScope<object, IToken>();
 		retval.Start = (IToken)input.LT(1);
 
 		object root_0 = default(object);
 
-		IToken NOT42 = default(IToken);
-		IToken SPACE43 = default(IToken);
-		IToken char_literal44 = default(IToken);
-		IToken char_literal46 = default(IToken);
-		IToken char_literal48 = default(IToken);
-		IToken char_literal50 = default(IToken);
-		AstParserRuleReturnScope<object, IToken> filterexpression45 = default(AstParserRuleReturnScope<object, IToken>);
-		AstParserRuleReturnScope<object, IToken> booleanexpression47 = default(AstParserRuleReturnScope<object, IToken>);
-		AstParserRuleReturnScope<object, IToken> filterexpression49 = default(AstParserRuleReturnScope<object, IToken>);
-		AstParserRuleReturnScope<object, IToken> booleanexpression51 = default(AstParserRuleReturnScope<object, IToken>);
-
-		object NOT42_tree = default(object);
-		object SPACE43_tree = default(object);
-		object char_literal44_tree = default(object);
-		object char_literal46_tree = default(object);
-		object char_literal48_tree = default(object);
-		object char_literal50_tree = default(object);
+		IToken NOT71 = default(IToken);
+		IToken SPACE72 = default(IToken);
+		IToken char_literal73 = default(IToken);
+		IToken char_literal75 = default(IToken);
+		IToken char_literal77 = default(IToken);
+		IToken char_literal79 = default(IToken);
+		AstParserRuleReturnScope<object, IToken> filterexpression74 = default(AstParserRuleReturnScope<object, IToken>);
+		AstParserRuleReturnScope<object, IToken> booleanexpression76 = default(AstParserRuleReturnScope<object, IToken>);
+		AstParserRuleReturnScope<object, IToken> filterexpression78 = default(AstParserRuleReturnScope<object, IToken>);
+		AstParserRuleReturnScope<object, IToken> booleanexpression80 = default(AstParserRuleReturnScope<object, IToken>);
+
+		object NOT71_tree = default(object);
+		object SPACE72_tree = default(object);
+		object char_literal73_tree = default(object);
+		object char_literal75_tree = default(object);
+		object char_literal77_tree = default(object);
+		object char_literal79_tree = default(object);
 		try { DebugEnterRule(GrammarFileName, "andexpression");
-		DebugLocation(65, 69);
+		DebugLocation(89, 69);
 		try
 		{
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:66:2: ( NOT ^ SPACE ( '(' filterexpression[subquery] ')' | booleanexpression[subquery] ) | ( '(' filterexpression[subquery] ')' | booleanexpression[subquery] ) )
-			int alt13=2;
-			try { DebugEnterDecision(13, false);
-			int LA13_1 = input.LA(1);
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:90:2: ( NOT ^ SPACE ( '(' filterexpression[subquery] ')' | booleanexpression[subquery] ) | ( '(' filterexpression[subquery] ')' | booleanexpression[subquery] ) )
+			int alt17=2;
+			try { DebugEnterDecision(17, false);
+			int LA17_1 = input.LA(1);
 
-			if ((LA13_1==NOT))
+			if ((LA17_1==NOT))
 			{
-				alt13 = 1;
+				alt17 = 1;
 			}
-			else if (((LA13_1>=BOOL && LA13_1<=BYTE)||(LA13_1>=DATETIME && LA13_1<=DECIMAL)||(LA13_1>=DOUBLE && LA13_1<=ENDSWITH)||LA13_1==GUID||(LA13_1>=HOUR && LA13_1<=IDENTIFIER)||LA13_1==INT||LA13_1==LONG||(LA13_1>=MINUTE && LA13_1<=MONTH)||LA13_1==NULL||(LA13_1>=SECOND && LA13_1<=SECONDS)||LA13_1==SINGLE||(LA13_1>=STARTSWITH && LA13_1<=SUBSTRINGOF)||LA13_1==TOLOWER||LA13_1==TOUPPER||(LA13_1>=YEAR && LA13_1<=YEARS)||LA13_1==71))
+			else if (((LA17_1>=BOOL && LA17_1<=BYTE)||(LA17_1>=DATETIME && LA17_1<=DECIMAL)||(LA17_1>=DOUBLE && LA17_1<=ENDSWITH)||LA17_1==GUID||(LA17_1>=HOUR && LA17_1<=IDENTIFIER)||LA17_1==INT||LA17_1==LONG||(LA17_1>=MINUTE && LA17_1<=MONTH)||LA17_1==NULL||(LA17_1>=SECOND && LA17_1<=SECONDS)||LA17_1==SINGLE||(LA17_1>=STARTSWITH && LA17_1<=SUBSTRINGOF)||LA17_1==TOLOWER||LA17_1==TOUPPER||(LA17_1>=YEAR && LA17_1<=YEARS)||LA17_1==75))
 			{
-				alt13 = 2;
+				alt17 = 2;
 			}
 			else
 			{
-				NoViableAltException nvae = new NoViableAltException("", 13, 0, input, 1);
+				NoViableAltException nvae = new NoViableAltException("", 17, 0, input, 1);
 				DebugRecognitionException(nvae);
 				throw nvae;
 			}
-			} finally { DebugExitDecision(13); }
-			switch (alt13)
+			} finally { DebugExitDecision(17); }
+			switch (alt17)
 			{
 			case 1:
 				DebugEnterAlt(1);
-				// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:66:4: NOT ^ SPACE ( '(' filterexpression[subquery] ')' | booleanexpression[subquery] )
+				// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:90:4: NOT ^ SPACE ( '(' filterexpression[subquery] ')' | booleanexpression[subquery] )
 				{
 				root_0 = (object)adaptor.Nil();
 
-				DebugLocation(66, 7);
-				NOT42=(IToken)Match(input,NOT,Follow._NOT_in_andexpression313); 
-				NOT42_tree = (object)adaptor.Create(NOT42);
-				root_0 = (object)adaptor.BecomeRoot(NOT42_tree, root_0);
-				DebugLocation(66, 9);
-				SPACE43=(IToken)Match(input,SPACE,Follow._SPACE_in_andexpression316); 
-				SPACE43_tree = (object)adaptor.Create(SPACE43);
-				adaptor.AddChild(root_0, SPACE43_tree);
-				DebugLocation(66, 15);
-				// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:66:15: ( '(' filterexpression[subquery] ')' | booleanexpression[subquery] )
-				int alt11=2;
-				try { DebugEnterSubRule(11);
-				try { DebugEnterDecision(11, false);
-				int LA11_1 = input.LA(1);
-
-				if ((LA11_1==71))
+				DebugLocation(90, 7);
+				NOT71=(IToken)Match(input,NOT,Follow._NOT_in_andexpression466); 
+				NOT71_tree = (object)adaptor.Create(NOT71);
+				root_0 = (object)adaptor.BecomeRoot(NOT71_tree, root_0);
+				DebugLocation(90, 9);
+				SPACE72=(IToken)Match(input,SPACE,Follow._SPACE_in_andexpression469); 
+				SPACE72_tree = (object)adaptor.Create(SPACE72);
+				adaptor.AddChild(root_0, SPACE72_tree);
+				DebugLocation(90, 15);
+				// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:90:15: ( '(' filterexpression[subquery] ')' | booleanexpression[subquery] )
+				int alt15=2;
+				try { DebugEnterSubRule(15);
+				try { DebugEnterDecision(15, false);
+				int LA15_1 = input.LA(1);
+
+				if ((LA15_1==75))
 				{
-					alt11 = 1;
+					alt15 = 1;
 				}
-				else if (((LA11_1>=BOOL && LA11_1<=BYTE)||(LA11_1>=DATETIME && LA11_1<=DECIMAL)||(LA11_1>=DOUBLE && LA11_1<=ENDSWITH)||LA11_1==GUID||(LA11_1>=HOUR && LA11_1<=IDENTIFIER)||LA11_1==INT||LA11_1==LONG||(LA11_1>=MINUTE && LA11_1<=MONTH)||LA11_1==NULL||(LA11_1>=SECOND && LA11_1<=SECONDS)||LA11_1==SINGLE||(LA11_1>=STARTSWITH && LA11_1<=SUBSTRINGOF)||LA11_1==TOLOWER||LA11_1==TOUPPER||(LA11_1>=YEAR && LA11_1<=YEARS)))
+				else if (((LA15_1>=BOOL && LA15_1<=BYTE)||(LA15_1>=DATETIME && LA15_1<=DECIMAL)||(LA15_1>=DOUBLE && LA15_1<=ENDSWITH)||LA15_1==GUID||(LA15_1>=HOUR && LA15_1<=IDENTIFIER)||LA15_1==INT||LA15_1==LONG||(LA15_1>=MINUTE && LA15_1<=MONTH)||LA15_1==NULL||(LA15_1>=SECOND && LA15_1<=SECONDS)||LA15_1==SINGLE||(LA15_1>=STARTSWITH && LA15_1<=SUBSTRINGOF)||LA15_1==TOLOWER||LA15_1==TOUPPER||(LA15_1>=YEAR && LA15_1<=YEARS)))
 				{
-					alt11 = 2;
+					alt15 = 2;
 				}
 				else
 				{
-					NoViableAltException nvae = new NoViableAltException("", 11, 0, input, 1);
+					NoViableAltException nvae = new NoViableAltException("", 15, 0, input, 1);
 					DebugRecognitionException(nvae);
 					throw nvae;
 				}
-				} finally { DebugExitDecision(11); }
-				switch (alt11)
+				} finally { DebugExitDecision(15); }
+				switch (alt15)
 				{
 				case 1:
 					DebugEnterAlt(1);
-					// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:66:16: '(' filterexpression[subquery] ')'
+					// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:90:16: '(' filterexpression[subquery] ')'
 					{
-					DebugLocation(66, 16);
-					char_literal44=(IToken)Match(input,71,Follow._71_in_andexpression319); 
-					char_literal44_tree = (object)adaptor.Create(char_literal44);
-					adaptor.AddChild(root_0, char_literal44_tree);
-					DebugLocation(66, 20);
-					PushFollow(Follow._filterexpression_in_andexpression321);
-					filterexpression45=filterexpression(subquery);
+					DebugLocation(90, 16);
+					char_literal73=(IToken)Match(input,75,Follow._75_in_andexpression472); 
+					char_literal73_tree = (object)adaptor.Create(char_literal73);
+					adaptor.AddChild(root_0, char_literal73_tree);
+					DebugLocation(90, 20);
+					PushFollow(Follow._filterexpression_in_andexpression474);
+					filterexpression74=filterexpression(subquery);
 					PopFollow();
 
-					adaptor.AddChild(root_0, filterexpression45.Tree);
-					DebugLocation(66, 47);
-					char_literal46=(IToken)Match(input,72,Follow._72_in_andexpression324); 
-					char_literal46_tree = (object)adaptor.Create(char_literal46);
-					adaptor.AddChild(root_0, char_literal46_tree);
+					adaptor.AddChild(root_0, filterexpression74.Tree);
+					DebugLocation(90, 47);
+					char_literal75=(IToken)Match(input,76,Follow._76_in_andexpression477); 
+					char_literal75_tree = (object)adaptor.Create(char_literal75);
+					adaptor.AddChild(root_0, char_literal75_tree);
 
 					}
 					break;
 				case 2:
 					DebugEnterAlt(2);
-					// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:66:53: booleanexpression[subquery]
+					// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:90:53: booleanexpression[subquery]
 					{
-					DebugLocation(66, 53);
-					PushFollow(Follow._booleanexpression_in_andexpression328);
-					booleanexpression47=booleanexpression(subquery);
+					DebugLocation(90, 53);
+					PushFollow(Follow._booleanexpression_in_andexpression481);
+					booleanexpression76=booleanexpression(subquery);
 					PopFollow();
 
-					adaptor.AddChild(root_0, booleanexpression47.Tree);
+					adaptor.AddChild(root_0, booleanexpression76.Tree);
 
 					}
 					break;
 
 				}
-				} finally { DebugExitSubRule(11); }
+				} finally { DebugExitSubRule(15); }
 
 
 				}
 				break;
 			case 2:
 				DebugEnterAlt(2);
-				// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:67:4: ( '(' filterexpression[subquery] ')' | booleanexpression[subquery] )
+				// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:91:4: ( '(' filterexpression[subquery] ')' | booleanexpression[subquery] )
 				{
 				root_0 = (object)adaptor.Nil();
 
-				DebugLocation(67, 4);
-				// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:67:4: ( '(' filterexpression[subquery] ')' | booleanexpression[subquery] )
-				int alt12=2;
-				try { DebugEnterSubRule(12);
-				try { DebugEnterDecision(12, false);
-				int LA12_1 = input.LA(1);
+				DebugLocation(91, 4);
+				// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:91:4: ( '(' filterexpression[subquery] ')' | booleanexpression[subquery] )
+				int alt16=2;
+				try { DebugEnterSubRule(16);
+				try { DebugEnterDecision(16, false);
+				int LA16_1 = input.LA(1);
 
-				if ((LA12_1==71))
+				if ((LA16_1==75))
 				{
-					alt12 = 1;
+					alt16 = 1;
 				}
-				else if (((LA12_1>=BOOL && LA12_1<=BYTE)||(LA12_1>=DATETIME && LA12_1<=DECIMAL)||(LA12_1>=DOUBLE && LA12_1<=ENDSWITH)||LA12_1==GUID||(LA12_1>=HOUR && LA12_1<=IDENTIFIER)||LA12_1==INT||LA12_1==LONG||(LA12_1>=MINUTE && LA12_1<=MONTH)||LA12_1==NULL||(LA12_1>=SECOND && LA12_1<=SECONDS)||LA12_1==SINGLE||(LA12_1>=STARTSWITH && LA12_1<=SUBSTRINGOF)||LA12_1==TOLOWER||LA12_1==TOUPPER||(LA12_1>=YEAR && LA12_1<=YEARS)))
+				else if (((LA16_1>=BOOL && LA16_1<=BYTE)||(LA16_1>=DATETIME && LA16_1<=DECIMAL)||(LA16_1>=DOUBLE && LA16_1<=ENDSWITH)||LA16_1==GUID||(LA16_1>=HOUR && LA16_1<=IDENTIFIER)||LA16_1==INT||LA16_1==LONG||(LA16_1>=MINUTE && LA16_1<=MONTH)||LA16_1==NULL||(LA16_1>=SECOND && LA16_1<=SECONDS)||LA16_1==SINGLE||(LA16_1>=STARTSWITH && LA16_1<=SUBSTRINGOF)||LA16_1==TOLOWER||LA16_1==TOUPPER||(LA16_1>=YEAR && LA16_1<=YEARS)))
 				{
-					alt12 = 2;
+					alt16 = 2;
 				}
 				else
 				{
-					NoViableAltException nvae = new NoViableAltException("", 12, 0, input, 1);
+					NoViableAltException nvae = new NoViableAltException("", 16, 0, input, 1);
 					DebugRecognitionException(nvae);
 					throw nvae;
 				}
-				} finally { DebugExitDecision(12); }
-				switch (alt12)
+				} finally { DebugExitDecision(16); }
+				switch (alt16)
 				{
 				case 1:
 					DebugEnterAlt(1);
-					// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:67:5: '(' filterexpression[subquery] ')'
+					// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:91:5: '(' filterexpression[subquery] ')'
 					{
-					DebugLocation(67, 5);
-					char_literal48=(IToken)Match(input,71,Follow._71_in_andexpression336); 
-					char_literal48_tree = (object)adaptor.Create(char_literal48);
-					adaptor.AddChild(root_0, char_literal48_tree);
-					DebugLocation(67, 9);
-					PushFollow(Follow._filterexpression_in_andexpression338);
-					filterexpression49=filterexpression(subquery);
+					DebugLocation(91, 5);
+					char_literal77=(IToken)Match(input,75,Follow._75_in_andexpression489); 
+					char_literal77_tree = (object)adaptor.Create(char_literal77);
+					adaptor.AddChild(root_0, char_literal77_tree);
+					DebugLocation(91, 9);
+					PushFollow(Follow._filterexpression_in_andexpression491);
+					filterexpression78=filterexpression(subquery);
 					PopFollow();
 
-					adaptor.AddChild(root_0, filterexpression49.Tree);
-					DebugLocation(67, 36);
-					char_literal50=(IToken)Match(input,72,Follow._72_in_andexpression341); 
-					char_literal50_tree = (object)adaptor.Create(char_literal50);
-					adaptor.AddChild(root_0, char_literal50_tree);
+					adaptor.AddChild(root_0, filterexpression78.Tree);
+					DebugLocation(91, 36);
+					char_literal79=(IToken)Match(input,76,Follow._76_in_andexpression494); 
+					char_literal79_tree = (object)adaptor.Create(char_literal79);
+					adaptor.AddChild(root_0, char_literal79_tree);
 
 					}
 					break;
 				case 2:
 					DebugEnterAlt(2);
-					// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:67:42: booleanexpression[subquery]
+					// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:91:42: booleanexpression[subquery]
 					{
-					DebugLocation(67, 42);
-					PushFollow(Follow._booleanexpression_in_andexpression345);
-					booleanexpression51=booleanexpression(subquery);
+					DebugLocation(91, 42);
+					PushFollow(Follow._booleanexpression_in_andexpression498);
+					booleanexpression80=booleanexpression(subquery);
 					PopFollow();
 
-					adaptor.AddChild(root_0, booleanexpression51.Tree);
+					adaptor.AddChild(root_0, booleanexpression80.Tree);
 
 					}
 					break;
 
 				}
-				} finally { DebugExitSubRule(12); }
+				} finally { DebugExitSubRule(16); }
 
 
 				}
@@ -1745,11 +2506,11 @@ private AstParserRuleReturnScope<object, IToken> andexpression(bool subquery)
 		}
 		finally
 		{
-			TraceOut("andexpression", 12);
-			LeaveRule("andexpression", 12);
+			TraceOut("andexpression", 20);
+			LeaveRule("andexpression", 20);
 			LeaveRule_andexpression();
 		}
-		DebugLocation(67, 69);
+		DebugLocation(91, 69);
 		} finally { DebugExitRule(GrammarFileName, "andexpression"); }
 		return retval;
 
@@ -1759,27 +2520,27 @@ private AstParserRuleReturnScope<object, IToken> andexpression(bool subquery)
 	partial void EnterRule_booleanexpression();
 	partial void LeaveRule_booleanexpression();
 	// $ANTLR start "booleanexpression"
-	// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:69:1: booleanexpression[bool subquery] : atom1= atom[subquery] ( SPACE (op= EQUALS |op= NOTEQUALS |op= GREATERTHAN |op= GREATERTHANOREQUAL |op= LESSTHAN |op= LESSTHANOREQUAL ) SPACE atom2= atom[subquery] -> ^( $op $atom1 $atom2) | -> ^( EQUALS[\"eq\"] $atom1 BOOL[\"true\"] ) ) ;
+	// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:93:1: booleanexpression[bool subquery] : atom1= atom[subquery] ( SPACE (op= EQUALS |op= NOTEQUALS |op= GREATERTHAN |op= GREATERTHANOREQUAL |op= LESSTHAN |op= LESSTHANOREQUAL ) SPACE atom2= atom[subquery] -> ^( $op $atom1 $atom2) | -> ^( EQUALS[\"eq\"] $atom1 BOOL[\"true\"] ) ) ;
 	[GrammarRule("booleanexpression")]
 	private AstParserRuleReturnScope<object, IToken> booleanexpression(bool subquery)
 	{
 		EnterRule_booleanexpression();
-		EnterRule("booleanexpression", 13);
-		TraceIn("booleanexpression", 13);
+		EnterRule("booleanexpression", 21);
+		TraceIn("booleanexpression", 21);
 		AstParserRuleReturnScope<object, IToken> retval = new AstParserRuleReturnScope<object, IToken>();
 		retval.Start = (IToken)input.LT(1);
 
 		object root_0 = default(object);
 
 		IToken op = default(IToken);
-		IToken SPACE52 = default(IToken);
-		IToken SPACE53 = default(IToken);
+		IToken SPACE81 = default(IToken);
+		IToken SPACE82 = default(IToken);
 		AstParserRuleReturnScope<object, IToken> atom1 = default(AstParserRuleReturnScope<object, IToken>);
 		AstParserRuleReturnScope<object, IToken> atom2 = default(AstParserRuleReturnScope<object, IToken>);
 
 		object op_tree = default(object);
-		object SPACE52_tree = default(object);
-		object SPACE53_tree = default(object);
+		object SPACE81_tree = default(object);
+		object SPACE82_tree = default(object);
 		RewriteRuleITokenStream stream_SPACE=new RewriteRuleITokenStream(adaptor,"token SPACE");
 		RewriteRuleITokenStream stream_EQUALS=new RewriteRuleITokenStream(adaptor,"token EQUALS");
 		RewriteRuleITokenStream stream_NOTEQUALS=new RewriteRuleITokenStream(adaptor,"token NOTEQUALS");
@@ -1789,120 +2550,120 @@ private AstParserRuleReturnScope<object, IToken> booleanexpression(bool subquery
 		RewriteRuleITokenStream stream_LESSTHANOREQUAL=new RewriteRuleITokenStream(adaptor,"token LESSTHANOREQUAL");
 		RewriteRuleSubtreeStream stream_atom=new RewriteRuleSubtreeStream(adaptor,"rule atom");
 		try { DebugEnterRule(GrammarFileName, "booleanexpression");
-		DebugLocation(69, 3);
+		DebugLocation(93, 3);
 		try
 		{
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:70:2: (atom1= atom[subquery] ( SPACE (op= EQUALS |op= NOTEQUALS |op= GREATERTHAN |op= GREATERTHANOREQUAL |op= LESSTHAN |op= LESSTHANOREQUAL ) SPACE atom2= atom[subquery] -> ^( $op $atom1 $atom2) | -> ^( EQUALS[\"eq\"] $atom1 BOOL[\"true\"] ) ) )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:94:2: (atom1= atom[subquery] ( SPACE (op= EQUALS |op= NOTEQUALS |op= GREATERTHAN |op= GREATERTHANOREQUAL |op= LESSTHAN |op= LESSTHANOREQUAL ) SPACE atom2= atom[subquery] -> ^( $op $atom1 $atom2) | -> ^( EQUALS[\"eq\"] $atom1 BOOL[\"true\"] ) ) )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:70:4: atom1= atom[subquery] ( SPACE (op= EQUALS |op= NOTEQUALS |op= GREATERTHAN |op= GREATERTHANOREQUAL |op= LESSTHAN |op= LESSTHANOREQUAL ) SPACE atom2= atom[subquery] -> ^( $op $atom1 $atom2) | -> ^( EQUALS[\"eq\"] $atom1 BOOL[\"true\"] ) )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:94:4: atom1= atom[subquery] ( SPACE (op= EQUALS |op= NOTEQUALS |op= GREATERTHAN |op= GREATERTHANOREQUAL |op= LESSTHAN |op= LESSTHANOREQUAL ) SPACE atom2= atom[subquery] -> ^( $op $atom1 $atom2) | -> ^( EQUALS[\"eq\"] $atom1 BOOL[\"true\"] ) )
 			{
-			DebugLocation(70, 9);
-			PushFollow(Follow._atom_in_booleanexpression361);
+			DebugLocation(94, 9);
+			PushFollow(Follow._atom_in_booleanexpression514);
 			atom1=atom(subquery);
 			PopFollow();
 
 			stream_atom.Add(atom1.Tree);
-			DebugLocation(70, 25);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:70:25: ( SPACE (op= EQUALS |op= NOTEQUALS |op= GREATERTHAN |op= GREATERTHANOREQUAL |op= LESSTHAN |op= LESSTHANOREQUAL ) SPACE atom2= atom[subquery] -> ^( $op $atom1 $atom2) | -> ^( EQUALS[\"eq\"] $atom1 BOOL[\"true\"] ) )
-			int alt15=2;
-			try { DebugEnterSubRule(15);
-			try { DebugEnterDecision(15, false);
-			int LA15_1 = input.LA(1);
-
-			if ((LA15_1==SPACE))
+			DebugLocation(94, 25);
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:94:25: ( SPACE (op= EQUALS |op= NOTEQUALS |op= GREATERTHAN |op= GREATERTHANOREQUAL |op= LESSTHAN |op= LESSTHANOREQUAL ) SPACE atom2= atom[subquery] -> ^( $op $atom1 $atom2) | -> ^( EQUALS[\"eq\"] $atom1 BOOL[\"true\"] ) )
+			int alt19=2;
+			try { DebugEnterSubRule(19);
+			try { DebugEnterDecision(19, false);
+			int LA19_1 = input.LA(1);
+
+			if ((LA19_1==SPACE))
 			{
-				int LA15_2 = input.LA(2);
+				int LA19_2 = input.LA(2);
 
-				if ((LA15_2==AND||LA15_2==OR))
+				if ((LA19_2==AND||LA19_2==OR))
 				{
-					alt15 = 2;
+					alt19 = 2;
 				}
-				else if ((LA15_2==EQUALS||(LA15_2>=GREATERTHAN && LA15_2<=GREATERTHANOREQUAL)||(LA15_2>=LESSTHAN && LA15_2<=LESSTHANOREQUAL)||LA15_2==NOTEQUALS))
+				else if ((LA19_2==EQUALS||(LA19_2>=GREATERTHAN && LA19_2<=GREATERTHANOREQUAL)||(LA19_2>=LESSTHAN && LA19_2<=LESSTHANOREQUAL)||LA19_2==NOTEQUALS))
 				{
-					alt15 = 1;
+					alt19 = 1;
 				}
 				else
 				{
-					NoViableAltException nvae = new NoViableAltException("", 15, 1, input, 2);
+					NoViableAltException nvae = new NoViableAltException("", 19, 1, input, 2);
 					DebugRecognitionException(nvae);
 					throw nvae;
 				}
 			}
-			else if ((LA15_1==EOF||(LA15_1>=EXPAND && LA15_1<=FILTER)||(LA15_1>=IGNORED && LA15_1<=INLINECOUNT)||LA15_1==ORDERBY||LA15_1==SELECT||LA15_1==SKIP||LA15_1==TOP||LA15_1==70||LA15_1==72))
+			else if ((LA19_1==EOF||LA19_1==APPLY||(LA19_1>=EXPAND && LA19_1<=FILTER)||(LA19_1>=IGNORED && LA19_1<=INLINECOUNT)||LA19_1==ORDERBY||LA19_1==SELECT||LA19_1==SKIP||LA19_1==TOP||LA19_1==74||LA19_1==76))
 			{
-				alt15 = 2;
+				alt19 = 2;
 			}
 			else
 			{
-				NoViableAltException nvae = new NoViableAltException("", 15, 0, input, 1);
+				NoViableAltException nvae = new NoViableAltException("", 19, 0, input, 1);
 				DebugRecognitionException(nvae);
 				throw nvae;
 			}
-			} finally { DebugExitDecision(15); }
-			switch (alt15)
+			} finally { DebugExitDecision(19); }
+			switch (alt19)
 			{
 			case 1:
 				DebugEnterAlt(1);
-				// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:71:4: SPACE (op= EQUALS |op= NOTEQUALS |op= GREATERTHAN |op= GREATERTHANOREQUAL |op= LESSTHAN |op= LESSTHANOREQUAL ) SPACE atom2= atom[subquery]
+				// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:95:4: SPACE (op= EQUALS |op= NOTEQUALS |op= GREATERTHAN |op= GREATERTHANOREQUAL |op= LESSTHAN |op= LESSTHANOREQUAL ) SPACE atom2= atom[subquery]
 				{
-				DebugLocation(71, 4);
-				SPACE52=(IToken)Match(input,SPACE,Follow._SPACE_in_booleanexpression369);  
-				stream_SPACE.Add(SPACE52);
+				DebugLocation(95, 4);
+				SPACE81=(IToken)Match(input,SPACE,Follow._SPACE_in_booleanexpression522);  
+				stream_SPACE.Add(SPACE81);
 
-				DebugLocation(71, 10);
-				// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:71:10: (op= EQUALS |op= NOTEQUALS |op= GREATERTHAN |op= GREATERTHANOREQUAL |op= LESSTHAN |op= LESSTHANOREQUAL )
-				int alt14=6;
-				try { DebugEnterSubRule(14);
-				try { DebugEnterDecision(14, false);
+				DebugLocation(95, 10);
+				// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:95:10: (op= EQUALS |op= NOTEQUALS |op= GREATERTHAN |op= GREATERTHANOREQUAL |op= LESSTHAN |op= LESSTHANOREQUAL )
+				int alt18=6;
+				try { DebugEnterSubRule(18);
+				try { DebugEnterDecision(18, false);
 				switch (input.LA(1))
 				{
 				case EQUALS:
 					{
-					alt14 = 1;
+					alt18 = 1;
 					}
 					break;
 				case NOTEQUALS:
 					{
-					alt14 = 2;
+					alt18 = 2;
 					}
 					break;
 				case GREATERTHAN:
 					{
-					alt14 = 3;
+					alt18 = 3;
 					}
 					break;
 				case GREATERTHANOREQUAL:
 					{
-					alt14 = 4;
+					alt18 = 4;
 					}
 					break;
 				case LESSTHAN:
 					{
-					alt14 = 5;
+					alt18 = 5;
 					}
 					break;
 				case LESSTHANOREQUAL:
 					{
-					alt14 = 6;
+					alt18 = 6;
 					}
 					break;
 				default:
 					{
-						NoViableAltException nvae = new NoViableAltException("", 14, 0, input, 1);
+						NoViableAltException nvae = new NoViableAltException("", 18, 0, input, 1);
 						DebugRecognitionException(nvae);
 						throw nvae;
 					}
 				}
 
-				} finally { DebugExitDecision(14); }
-				switch (alt14)
+				} finally { DebugExitDecision(18); }
+				switch (alt18)
 				{
 				case 1:
 					DebugEnterAlt(1);
-					// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:71:11: op= EQUALS
+					// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:95:11: op= EQUALS
 					{
-					DebugLocation(71, 13);
-					op=(IToken)Match(input,EQUALS,Follow._EQUALS_in_booleanexpression374);  
+					DebugLocation(95, 13);
+					op=(IToken)Match(input,EQUALS,Follow._EQUALS_in_booleanexpression527);  
 					stream_EQUALS.Add(op);
 
 
@@ -1910,10 +2671,10 @@ private AstParserRuleReturnScope<object, IToken> booleanexpression(bool subquery
 					break;
 				case 2:
 					DebugEnterAlt(2);
-					// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:71:23: op= NOTEQUALS
+					// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:95:23: op= NOTEQUALS
 					{
-					DebugLocation(71, 25);
-					op=(IToken)Match(input,NOTEQUALS,Follow._NOTEQUALS_in_booleanexpression380);  
+					DebugLocation(95, 25);
+					op=(IToken)Match(input,NOTEQUALS,Follow._NOTEQUALS_in_booleanexpression533);  
 					stream_NOTEQUALS.Add(op);
 
 
@@ -1921,10 +2682,10 @@ private AstParserRuleReturnScope<object, IToken> booleanexpression(bool subquery
 					break;
 				case 3:
 					DebugEnterAlt(3);
-					// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:71:38: op= GREATERTHAN
+					// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:95:38: op= GREATERTHAN
 					{
-					DebugLocation(71, 40);
-					op=(IToken)Match(input,GREATERTHAN,Follow._GREATERTHAN_in_booleanexpression386);  
+					DebugLocation(95, 40);
+					op=(IToken)Match(input,GREATERTHAN,Follow._GREATERTHAN_in_booleanexpression539);  
 					stream_GREATERTHAN.Add(op);
 
 
@@ -1932,10 +2693,10 @@ private AstParserRuleReturnScope<object, IToken> booleanexpression(bool subquery
 					break;
 				case 4:
 					DebugEnterAlt(4);
-					// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:71:55: op= GREATERTHANOREQUAL
+					// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:95:55: op= GREATERTHANOREQUAL
 					{
-					DebugLocation(71, 57);
-					op=(IToken)Match(input,GREATERTHANOREQUAL,Follow._GREATERTHANOREQUAL_in_booleanexpression392);  
+					DebugLocation(95, 57);
+					op=(IToken)Match(input,GREATERTHANOREQUAL,Follow._GREATERTHANOREQUAL_in_booleanexpression545);  
 					stream_GREATERTHANOREQUAL.Add(op);
 
 
@@ -1943,10 +2704,10 @@ private AstParserRuleReturnScope<object, IToken> booleanexpression(bool subquery
 					break;
 				case 5:
 					DebugEnterAlt(5);
-					// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:71:79: op= LESSTHAN
+					// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:95:79: op= LESSTHAN
 					{
-					DebugLocation(71, 81);
-					op=(IToken)Match(input,LESSTHAN,Follow._LESSTHAN_in_booleanexpression398);  
+					DebugLocation(95, 81);
+					op=(IToken)Match(input,LESSTHAN,Follow._LESSTHAN_in_booleanexpression551);  
 					stream_LESSTHAN.Add(op);
 
 
@@ -1954,10 +2715,10 @@ private AstParserRuleReturnScope<object, IToken> booleanexpression(bool subquery
 					break;
 				case 6:
 					DebugEnterAlt(6);
-					// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:71:93: op= LESSTHANOREQUAL
+					// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:95:93: op= LESSTHANOREQUAL
 					{
-					DebugLocation(71, 95);
-					op=(IToken)Match(input,LESSTHANOREQUAL,Follow._LESSTHANOREQUAL_in_booleanexpression404);  
+					DebugLocation(95, 95);
+					op=(IToken)Match(input,LESSTHANOREQUAL,Follow._LESSTHANOREQUAL_in_booleanexpression557);  
 					stream_LESSTHANOREQUAL.Add(op);
 
 
@@ -1965,14 +2726,14 @@ private AstParserRuleReturnScope<object, IToken> booleanexpression(bool subquery
 					break;
 
 				}
-				} finally { DebugExitSubRule(14); }
+				} finally { DebugExitSubRule(18); }
 
-				DebugLocation(71, 113);
-				SPACE53=(IToken)Match(input,SPACE,Follow._SPACE_in_booleanexpression407);  
-				stream_SPACE.Add(SPACE53);
+				DebugLocation(95, 113);
+				SPACE82=(IToken)Match(input,SPACE,Follow._SPACE_in_booleanexpression560);  
+				stream_SPACE.Add(SPACE82);
 
-				DebugLocation(71, 124);
-				PushFollow(Follow._atom_in_booleanexpression411);
+				DebugLocation(95, 124);
+				PushFollow(Follow._atom_in_booleanexpression564);
 				atom2=atom(subquery);
 				PopFollow();
 
@@ -1994,18 +2755,18 @@ private AstParserRuleReturnScope<object, IToken> booleanexpression(bool subquery
 				RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.Tree:null);
 
 				root_0 = (object)adaptor.Nil();
-				// 72:4: -> ^( $op $atom1 $atom2)
+				// 96:4: -> ^( $op $atom1 $atom2)
 				{
-					DebugLocation(72, 7);
-					// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:72:7: ^( $op $atom1 $atom2)
+					DebugLocation(96, 7);
+					// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:96:7: ^( $op $atom1 $atom2)
 					{
 					object root_1 = (object)adaptor.Nil();
-					DebugLocation(72, 10);
+					DebugLocation(96, 10);
 					root_1 = (object)adaptor.BecomeRoot(stream_op.NextNode(), root_1);
 
-					DebugLocation(72, 14);
+					DebugLocation(96, 14);
 					adaptor.AddChild(root_1, stream_atom1.NextTree());
-					DebugLocation(72, 21);
+					DebugLocation(96, 21);
 					adaptor.AddChild(root_1, stream_atom2.NextTree());
 
 					adaptor.AddChild(root_0, root_1);
@@ -2020,7 +2781,7 @@ private AstParserRuleReturnScope<object, IToken> booleanexpression(bool subquery
 				break;
 			case 2:
 				DebugEnterAlt(2);
-				// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:73:5: 
+				// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:97:5: 
 				{
 
 				{
@@ -2036,18 +2797,18 @@ private AstParserRuleReturnScope<object, IToken> booleanexpression(bool subquery
 				RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.Tree:null);
 
 				root_0 = (object)adaptor.Nil();
-				// 73:5: -> ^( EQUALS[\"eq\"] $atom1 BOOL[\"true\"] )
+				// 97:5: -> ^( EQUALS[\"eq\"] $atom1 BOOL[\"true\"] )
 				{
-					DebugLocation(73, 8);
-					// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:73:8: ^( EQUALS[\"eq\"] $atom1 BOOL[\"true\"] )
+					DebugLocation(97, 8);
+					// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:97:8: ^( EQUALS[\"eq\"] $atom1 BOOL[\"true\"] )
 					{
 					object root_1 = (object)adaptor.Nil();
-					DebugLocation(73, 10);
+					DebugLocation(97, 10);
 					root_1 = (object)adaptor.BecomeRoot((object)adaptor.Create(EQUALS, "eq"), root_1);
 
-					DebugLocation(73, 24);
+					DebugLocation(97, 24);
 					adaptor.AddChild(root_1, stream_atom1.NextTree());
-					DebugLocation(73, 30);
+					DebugLocation(97, 30);
 					adaptor.AddChild(root_1, (object)adaptor.Create(BOOL, "true"));
 
 					adaptor.AddChild(root_0, root_1);
@@ -2062,7 +2823,7 @@ private AstParserRuleReturnScope<object, IToken> booleanexpression(bool subquery
 				break;
 
 			}
-			} finally { DebugExitSubRule(15); }
+			} finally { DebugExitSubRule(19); }
 
 
 			}
@@ -2082,11 +2843,11 @@ private AstParserRuleReturnScope<object, IToken> booleanexpression(bool subquery
 		}
 		finally
 		{
-			TraceOut("booleanexpression", 13);
-			LeaveRule("booleanexpression", 13);
+			TraceOut("booleanexpression", 21);
+			LeaveRule("booleanexpression", 21);
 			LeaveRule_booleanexpression();
 		}
-		DebugLocation(74, 3);
+		DebugLocation(98, 3);
 		} finally { DebugExitRule(GrammarFileName, "booleanexpression"); }
 		return retval;
 
@@ -2096,29 +2857,29 @@ private AstParserRuleReturnScope<object, IToken> booleanexpression(bool subquery
 	partial void EnterRule_atom();
 	partial void LeaveRule_atom();
 	// $ANTLR start "atom"
-	// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:76:1: atom[bool subquery] : ( functioncall[subquery] | constant | accessor[subquery] );
+	// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:100:1: atom[bool subquery] : ( functioncall[subquery] | constant | accessor[subquery] );
 	[GrammarRule("atom")]
 	private AstParserRuleReturnScope<object, IToken> atom(bool subquery)
 	{
 		EnterRule_atom();
-		EnterRule("atom", 14);
-		TraceIn("atom", 14);
+		EnterRule("atom", 22);
+		TraceIn("atom", 22);
 		AstParserRuleReturnScope<object, IToken> retval = new AstParserRuleReturnScope<object, IToken>();
 		retval.Start = (IToken)input.LT(1);
 
 		object root_0 = default(object);
 
-		AstParserRuleReturnScope<object, IToken> functioncall54 = default(AstParserRuleReturnScope<object, IToken>);
-		AstParserRuleReturnScope<object, IToken> constant55 = default(AstParserRuleReturnScope<object, IToken>);
-		AstParserRuleReturnScope<object, IToken> accessor56 = default(AstParserRuleReturnScope<object, IToken>);
+		AstParserRuleReturnScope<object, IToken> functioncall83 = default(AstParserRuleReturnScope<object, IToken>);
+		AstParserRuleReturnScope<object, IToken> constant84 = default(AstParserRuleReturnScope<object, IToken>);
+		AstParserRuleReturnScope<object, IToken> accessor85 = default(AstParserRuleReturnScope<object, IToken>);
 
 		try { DebugEnterRule(GrammarFileName, "atom");
-		DebugLocation(76, 21);
+		DebugLocation(100, 21);
 		try
 		{
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:77:2: ( functioncall[subquery] | constant | accessor[subquery] )
-			int alt16=3;
-			try { DebugEnterDecision(16, false);
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:101:2: ( functioncall[subquery] | constant | accessor[subquery] )
+			int alt20=3;
+			try { DebugEnterDecision(20, false);
 			switch (input.LA(1))
 			{
 			case DAY:
@@ -2138,7 +2899,7 @@ private AstParserRuleReturnScope<object, IToken> atom(bool subquery)
 			case YEAR:
 			case YEARS:
 				{
-				alt16 = 1;
+				alt20 = 1;
 				}
 				break;
 			case BOOL:
@@ -2153,68 +2914,68 @@ private AstParserRuleReturnScope<object, IToken> atom(bool subquery)
 			case SINGLE:
 			case STRING:
 				{
-				alt16 = 2;
+				alt20 = 2;
 				}
 				break;
 			case DYNAMICIDENTIFIER:
 			case IDENTIFIER:
 				{
-				alt16 = 3;
+				alt20 = 3;
 				}
 				break;
 			default:
 				{
-					NoViableAltException nvae = new NoViableAltException("", 16, 0, input, 1);
+					NoViableAltException nvae = new NoViableAltException("", 20, 0, input, 1);
 					DebugRecognitionException(nvae);
 					throw nvae;
 				}
 			}
 
-			} finally { DebugExitDecision(16); }
-			switch (alt16)
+			} finally { DebugExitDecision(20); }
+			switch (alt20)
 			{
 			case 1:
 				DebugEnterAlt(1);
-				// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:77:4: functioncall[subquery]
+				// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:101:4: functioncall[subquery]
 				{
 				root_0 = (object)adaptor.Nil();
 
-				DebugLocation(77, 4);
-				PushFollow(Follow._functioncall_in_atom463);
-				functioncall54=functioncall(subquery);
+				DebugLocation(101, 4);
+				PushFollow(Follow._functioncall_in_atom616);
+				functioncall83=functioncall(subquery);
 				PopFollow();
 
-				adaptor.AddChild(root_0, functioncall54.Tree);
+				adaptor.AddChild(root_0, functioncall83.Tree);
 
 				}
 				break;
 			case 2:
 				DebugEnterAlt(2);
-				// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:78:4: constant
+				// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:102:4: constant
 				{
 				root_0 = (object)adaptor.Nil();
 
-				DebugLocation(78, 4);
-				PushFollow(Follow._constant_in_atom469);
-				constant55=constant();
+				DebugLocation(102, 4);
+				PushFollow(Follow._constant_in_atom622);
+				constant84=constant();
 				PopFollow();
 
-				adaptor.AddChild(root_0, constant55.Tree);
+				adaptor.AddChild(root_0, constant84.Tree);
 
 				}
 				break;
 			case 3:
 				DebugEnterAlt(3);
-				// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:79:4: accessor[subquery]
+				// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:103:4: accessor[subquery]
 				{
 				root_0 = (object)adaptor.Nil();
 
-				DebugLocation(79, 4);
-				PushFollow(Follow._accessor_in_atom474);
-				accessor56=accessor(subquery);
+				DebugLocation(103, 4);
+				PushFollow(Follow._accessor_in_atom627);
+				accessor85=accessor(subquery);
 				PopFollow();
 
-				adaptor.AddChild(root_0, accessor56.Tree);
+				adaptor.AddChild(root_0, accessor85.Tree);
 
 				}
 				break;
@@ -2235,11 +2996,11 @@ private AstParserRuleReturnScope<object, IToken> atom(bool subquery)
 		}
 		finally
 		{
-			TraceOut("atom", 14);
-			LeaveRule("atom", 14);
+			TraceOut("atom", 22);
+			LeaveRule("atom", 22);
 			LeaveRule_atom();
 		}
-		DebugLocation(79, 21);
+		DebugLocation(103, 21);
 		} finally { DebugExitRule(GrammarFileName, "atom"); }
 		return retval;
 
@@ -2249,104 +3010,104 @@ private AstParserRuleReturnScope<object, IToken> atom(bool subquery)
 	partial void EnterRule_functioncall();
 	partial void LeaveRule_functioncall();
 	// $ANTLR start "functioncall"
-	// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:81:1: functioncall[bool subquery] : function ^ '(' atom[subquery] ( ',' atom[subquery] )* ')' ;
+	// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:105:1: functioncall[bool subquery] : function ^ '(' atom[subquery] ( ',' atom[subquery] )* ')' ;
 	[GrammarRule("functioncall")]
 	private AstParserRuleReturnScope<object, IToken> functioncall(bool subquery)
 	{
 		EnterRule_functioncall();
-		EnterRule("functioncall", 15);
-		TraceIn("functioncall", 15);
+		EnterRule("functioncall", 23);
+		TraceIn("functioncall", 23);
 		AstParserRuleReturnScope<object, IToken> retval = new AstParserRuleReturnScope<object, IToken>();
 		retval.Start = (IToken)input.LT(1);
 
 		object root_0 = default(object);
 
-		IToken char_literal58 = default(IToken);
-		IToken char_literal60 = default(IToken);
-		IToken char_literal62 = default(IToken);
-		AstParserRuleReturnScope<object, IToken> function57 = default(AstParserRuleReturnScope<object, IToken>);
-		AstParserRuleReturnScope<object, IToken> atom59 = default(AstParserRuleReturnScope<object, IToken>);
-		AstParserRuleReturnScope<object, IToken> atom61 = default(AstParserRuleReturnScope<object, IToken>);
+		IToken char_literal87 = default(IToken);
+		IToken char_literal89 = default(IToken);
+		IToken char_literal91 = default(IToken);
+		AstParserRuleReturnScope<object, IToken> function86 = default(AstParserRuleReturnScope<object, IToken>);
+		AstParserRuleReturnScope<object, IToken> atom88 = default(AstParserRuleReturnScope<object, IToken>);
+		AstParserRuleReturnScope<object, IToken> atom90 = default(AstParserRuleReturnScope<object, IToken>);
 
-		object char_literal58_tree = default(object);
-		object char_literal60_tree = default(object);
-		object char_literal62_tree = default(object);
+		object char_literal87_tree = default(object);
+		object char_literal89_tree = default(object);
+		object char_literal91_tree = default(object);
 		try { DebugEnterRule(GrammarFileName, "functioncall");
-		DebugLocation(81, 57);
+		DebugLocation(105, 57);
 		try
 		{
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:82:2: ( function ^ '(' atom[subquery] ( ',' atom[subquery] )* ')' )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:106:2: ( function ^ '(' atom[subquery] ( ',' atom[subquery] )* ')' )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:82:4: function ^ '(' atom[subquery] ( ',' atom[subquery] )* ')'
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:106:4: function ^ '(' atom[subquery] ( ',' atom[subquery] )* ')'
 			{
 			root_0 = (object)adaptor.Nil();
 
-			DebugLocation(82, 12);
-			PushFollow(Follow._function_in_functioncall486);
-			function57=function();
+			DebugLocation(106, 12);
+			PushFollow(Follow._function_in_functioncall639);
+			function86=function();
 			PopFollow();
 
-			root_0 = (object)adaptor.BecomeRoot(function57.Tree, root_0);
-			DebugLocation(82, 14);
-			char_literal58=(IToken)Match(input,71,Follow._71_in_functioncall489); 
-			char_literal58_tree = (object)adaptor.Create(char_literal58);
-			adaptor.AddChild(root_0, char_literal58_tree);
-			DebugLocation(82, 18);
-			PushFollow(Follow._atom_in_functioncall491);
-			atom59=atom(subquery);
+			root_0 = (object)adaptor.BecomeRoot(function86.Tree, root_0);
+			DebugLocation(106, 14);
+			char_literal87=(IToken)Match(input,75,Follow._75_in_functioncall642); 
+			char_literal87_tree = (object)adaptor.Create(char_literal87);
+			adaptor.AddChild(root_0, char_literal87_tree);
+			DebugLocation(106, 18);
+			PushFollow(Follow._atom_in_functioncall644);
+			atom88=atom(subquery);
 			PopFollow();
 
-			adaptor.AddChild(root_0, atom59.Tree);
-			DebugLocation(82, 33);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:82:33: ( ',' atom[subquery] )*
-			try { DebugEnterSubRule(17);
+			adaptor.AddChild(root_0, atom88.Tree);
+			DebugLocation(106, 33);
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:106:33: ( ',' atom[subquery] )*
+			try { DebugEnterSubRule(21);
 			while (true)
 			{
-				int alt17=2;
-				try { DebugEnterDecision(17, false);
-				int LA17_1 = input.LA(1);
+				int alt21=2;
+				try { DebugEnterDecision(21, false);
+				int LA21_1 = input.LA(1);
 
-				if ((LA17_1==73))
+				if ((LA21_1==77))
 				{
-					alt17 = 1;
+					alt21 = 1;
 				}
 
 
-				} finally { DebugExitDecision(17); }
-				switch ( alt17 )
+				} finally { DebugExitDecision(21); }
+				switch ( alt21 )
 				{
 				case 1:
 					DebugEnterAlt(1);
-					// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:82:34: ',' atom[subquery]
+					// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:106:34: ',' atom[subquery]
 					{
-					DebugLocation(82, 34);
-					char_literal60=(IToken)Match(input,73,Follow._73_in_functioncall495); 
-					char_literal60_tree = (object)adaptor.Create(char_literal60);
-					adaptor.AddChild(root_0, char_literal60_tree);
-					DebugLocation(82, 38);
-					PushFollow(Follow._atom_in_functioncall497);
-					atom61=atom(subquery);
+					DebugLocation(106, 34);
+					char_literal89=(IToken)Match(input,77,Follow._77_in_functioncall648); 
+					char_literal89_tree = (object)adaptor.Create(char_literal89);
+					adaptor.AddChild(root_0, char_literal89_tree);
+					DebugLocation(106, 38);
+					PushFollow(Follow._atom_in_functioncall650);
+					atom90=atom(subquery);
 					PopFollow();
 
-					adaptor.AddChild(root_0, atom61.Tree);
+					adaptor.AddChild(root_0, atom90.Tree);
 
 					}
 					break;
 
 				default:
-					goto loop17;
+					goto loop21;
 				}
 			}
 
-			loop17:
+			loop21:
 				;
 
-			} finally { DebugExitSubRule(17); }
+			} finally { DebugExitSubRule(21); }
 
-			DebugLocation(82, 55);
-			char_literal62=(IToken)Match(input,72,Follow._72_in_functioncall502); 
-			char_literal62_tree = (object)adaptor.Create(char_literal62);
-			adaptor.AddChild(root_0, char_literal62_tree);
+			DebugLocation(106, 55);
+			char_literal91=(IToken)Match(input,76,Follow._76_in_functioncall655); 
+			char_literal91_tree = (object)adaptor.Create(char_literal91);
+			adaptor.AddChild(root_0, char_literal91_tree);
 
 			}
 
@@ -2365,11 +3126,11 @@ private AstParserRuleReturnScope<object, IToken> functioncall(bool subquery)
 		}
 		finally
 		{
-			TraceOut("functioncall", 15);
-			LeaveRule("functioncall", 15);
+			TraceOut("functioncall", 23);
+			LeaveRule("functioncall", 23);
 			LeaveRule_functioncall();
 		}
-		DebugLocation(82, 57);
+		DebugLocation(106, 57);
 		} finally { DebugExitRule(GrammarFileName, "functioncall"); }
 		return retval;
 
@@ -2379,13 +3140,13 @@ private AstParserRuleReturnScope<object, IToken> functioncall(bool subquery)
 	partial void EnterRule_accessor();
 	partial void LeaveRule_accessor();
 	// $ANTLR start "accessor"
-	// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:84:1: accessor[bool subquery] : ( propertyname[subquery] -> propertyname ) ( '/' (func= ANY |func= ALL |func= COUNT |func= MAX |func= MIN |func= SUM |func= AVERAGE ) '(' ( (id= IDENTIFIER ':' SPACE filterexpression[true] ) -> ^( $func $accessor ALIAS[$id] filterexpression ) | -> ^( $func $accessor) ) ')' )? ;
+	// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:108:1: accessor[bool subquery] : ( propertyname[subquery] -> propertyname ) ( '/' (func= ANY |func= ALL |func= COUNT |func= MAX |func= MIN |func= SUM |func= AVERAGE ) '(' ( (id= IDENTIFIER ':' SPACE filterexpression[true] ) -> ^( $func $accessor ALIAS[$id] filterexpression ) | -> ^( $func $accessor) ) ')' )? ;
 	[GrammarRule("accessor")]
 	private AstParserRuleReturnScope<object, IToken> accessor(bool subquery)
 	{
 		EnterRule_accessor();
-		EnterRule("accessor", 16);
-		TraceIn("accessor", 16);
+		EnterRule("accessor", 24);
+		TraceIn("accessor", 24);
 		AstParserRuleReturnScope<object, IToken> retval = new AstParserRuleReturnScope<object, IToken>();
 		retval.Start = (IToken)input.LT(1);
 
@@ -2393,22 +3154,22 @@ private AstParserRuleReturnScope<object, IToken> accessor(bool subquery)
 
 		IToken func = default(IToken);
 		IToken id = default(IToken);
-		IToken char_literal64 = default(IToken);
-		IToken char_literal65 = default(IToken);
-		IToken char_literal66 = default(IToken);
-		IToken SPACE67 = default(IToken);
-		IToken char_literal69 = default(IToken);
-		AstParserRuleReturnScope<object, IToken> propertyname63 = default(AstParserRuleReturnScope<object, IToken>);
-		AstParserRuleReturnScope<object, IToken> filterexpression68 = default(AstParserRuleReturnScope<object, IToken>);
+		IToken char_literal93 = default(IToken);
+		IToken char_literal94 = default(IToken);
+		IToken char_literal95 = default(IToken);
+		IToken SPACE96 = default(IToken);
+		IToken char_literal98 = default(IToken);
+		AstParserRuleReturnScope<object, IToken> propertyname92 = default(AstParserRuleReturnScope<object, IToken>);
+		AstParserRuleReturnScope<object, IToken> filterexpression97 = default(AstParserRuleReturnScope<object, IToken>);
 
 		object func_tree = default(object);
 		object id_tree = default(object);
-		object char_literal64_tree = default(object);
-		object char_literal65_tree = default(object);
-		object char_literal66_tree = default(object);
-		object SPACE67_tree = default(object);
-		object char_literal69_tree = default(object);
-		RewriteRuleITokenStream stream_74=new RewriteRuleITokenStream(adaptor,"token 74");
+		object char_literal93_tree = default(object);
+		object char_literal94_tree = default(object);
+		object char_literal95_tree = default(object);
+		object SPACE96_tree = default(object);
+		object char_literal98_tree = default(object);
+		RewriteRuleITokenStream stream_78=new RewriteRuleITokenStream(adaptor,"token 78");
 		RewriteRuleITokenStream stream_ANY=new RewriteRuleITokenStream(adaptor,"token ANY");
 		RewriteRuleITokenStream stream_ALL=new RewriteRuleITokenStream(adaptor,"token ALL");
 		RewriteRuleITokenStream stream_COUNT=new RewriteRuleITokenStream(adaptor,"token COUNT");
@@ -2416,32 +3177,32 @@ private AstParserRuleReturnScope<object, IToken> accessor(bool subquery)
 		RewriteRuleITokenStream stream_MIN=new RewriteRuleITokenStream(adaptor,"token MIN");
 		RewriteRuleITokenStream stream_SUM=new RewriteRuleITokenStream(adaptor,"token SUM");
 		RewriteRuleITokenStream stream_AVERAGE=new RewriteRuleITokenStream(adaptor,"token AVERAGE");
-		RewriteRuleITokenStream stream_71=new RewriteRuleITokenStream(adaptor,"token 71");
-		RewriteRuleITokenStream stream_IDENTIFIER=new RewriteRuleITokenStream(adaptor,"token IDENTIFIER");
 		RewriteRuleITokenStream stream_75=new RewriteRuleITokenStream(adaptor,"token 75");
+		RewriteRuleITokenStream stream_IDENTIFIER=new RewriteRuleITokenStream(adaptor,"token IDENTIFIER");
+		RewriteRuleITokenStream stream_79=new RewriteRuleITokenStream(adaptor,"token 79");
 		RewriteRuleITokenStream stream_SPACE=new RewriteRuleITokenStream(adaptor,"token SPACE");
-		RewriteRuleITokenStream stream_72=new RewriteRuleITokenStream(adaptor,"token 72");
+		RewriteRuleITokenStream stream_76=new RewriteRuleITokenStream(adaptor,"token 76");
 		RewriteRuleSubtreeStream stream_propertyname=new RewriteRuleSubtreeStream(adaptor,"rule propertyname");
 		RewriteRuleSubtreeStream stream_filterexpression=new RewriteRuleSubtreeStream(adaptor,"rule filterexpression");
 		try { DebugEnterRule(GrammarFileName, "accessor");
-		DebugLocation(84, 4);
+		DebugLocation(108, 4);
 		try
 		{
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:84:24: ( ( propertyname[subquery] -> propertyname ) ( '/' (func= ANY |func= ALL |func= COUNT |func= MAX |func= MIN |func= SUM |func= AVERAGE ) '(' ( (id= IDENTIFIER ':' SPACE filterexpression[true] ) -> ^( $func $accessor ALIAS[$id] filterexpression ) | -> ^( $func $accessor) ) ')' )? )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:108:24: ( ( propertyname[subquery] -> propertyname ) ( '/' (func= ANY |func= ALL |func= COUNT |func= MAX |func= MIN |func= SUM |func= AVERAGE ) '(' ( (id= IDENTIFIER ':' SPACE filterexpression[true] ) -> ^( $func $accessor ALIAS[$id] filterexpression ) | -> ^( $func $accessor) ) ')' )? )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:85:3: ( propertyname[subquery] -> propertyname ) ( '/' (func= ANY |func= ALL |func= COUNT |func= MAX |func= MIN |func= SUM |func= AVERAGE ) '(' ( (id= IDENTIFIER ':' SPACE filterexpression[true] ) -> ^( $func $accessor ALIAS[$id] filterexpression ) | -> ^( $func $accessor) ) ')' )?
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:109:3: ( propertyname[subquery] -> propertyname ) ( '/' (func= ANY |func= ALL |func= COUNT |func= MAX |func= MIN |func= SUM |func= AVERAGE ) '(' ( (id= IDENTIFIER ':' SPACE filterexpression[true] ) -> ^( $func $accessor ALIAS[$id] filterexpression ) | -> ^( $func $accessor) ) ')' )?
 			{
-			DebugLocation(85, 3);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:85:3: ( propertyname[subquery] -> propertyname )
+			DebugLocation(109, 3);
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:109:3: ( propertyname[subquery] -> propertyname )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:85:4: propertyname[subquery]
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:109:4: propertyname[subquery]
 			{
-			DebugLocation(85, 4);
-			PushFollow(Follow._propertyname_in_accessor514);
-			propertyname63=propertyname(subquery);
+			DebugLocation(109, 4);
+			PushFollow(Follow._propertyname_in_accessor667);
+			propertyname92=propertyname(subquery);
 			PopFollow();
 
-			stream_propertyname.Add(propertyname63.Tree);
+			stream_propertyname.Add(propertyname92.Tree);
 
 
 			{
@@ -2456,9 +3217,9 @@ private AstParserRuleReturnScope<object, IToken> accessor(bool subquery)
 			RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.Tree:null);
 
 			root_0 = (object)adaptor.Nil();
-			// 85:27: -> propertyname
+			// 109:27: -> propertyname
 			{
-				DebugLocation(85, 30);
+				DebugLocation(109, 30);
 				adaptor.AddChild(root_0, stream_propertyname.NextTree());
 
 			}
@@ -2468,87 +3229,87 @@ private AstParserRuleReturnScope<object, IToken> accessor(bool subquery)
 
 			}
 
-			DebugLocation(85, 44);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:85:44: ( '/' (func= ANY |func= ALL |func= COUNT |func= MAX |func= MIN |func= SUM |func= AVERAGE ) '(' ( (id= IDENTIFIER ':' SPACE filterexpression[true] ) -> ^( $func $accessor ALIAS[$id] filterexpression ) | -> ^( $func $accessor) ) ')' )?
-			int alt20=2;
-			try { DebugEnterSubRule(20);
-			try { DebugEnterDecision(20, false);
-			int LA20_1 = input.LA(1);
+			DebugLocation(109, 44);
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:109:44: ( '/' (func= ANY |func= ALL |func= COUNT |func= MAX |func= MIN |func= SUM |func= AVERAGE ) '(' ( (id= IDENTIFIER ':' SPACE filterexpression[true] ) -> ^( $func $accessor ALIAS[$id] filterexpression ) | -> ^( $func $accessor) ) ')' )?
+			int alt24=2;
+			try { DebugEnterSubRule(24);
+			try { DebugEnterDecision(24, false);
+			int LA24_1 = input.LA(1);
 
-			if ((LA20_1==74))
+			if ((LA24_1==78))
 			{
-				alt20 = 1;
+				alt24 = 1;
 			}
-			} finally { DebugExitDecision(20); }
-			switch (alt20)
+			} finally { DebugExitDecision(24); }
+			switch (alt24)
 			{
 			case 1:
 				DebugEnterAlt(1);
-				// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:86:4: '/' (func= ANY |func= ALL |func= COUNT |func= MAX |func= MIN |func= SUM |func= AVERAGE ) '(' ( (id= IDENTIFIER ':' SPACE filterexpression[true] ) -> ^( $func $accessor ALIAS[$id] filterexpression ) | -> ^( $func $accessor) ) ')'
+				// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:110:4: '/' (func= ANY |func= ALL |func= COUNT |func= MAX |func= MIN |func= SUM |func= AVERAGE ) '(' ( (id= IDENTIFIER ':' SPACE filterexpression[true] ) -> ^( $func $accessor ALIAS[$id] filterexpression ) | -> ^( $func $accessor) ) ')'
 				{
-				DebugLocation(86, 4);
-				char_literal64=(IToken)Match(input,74,Follow._74_in_accessor527);  
-				stream_74.Add(char_literal64);
+				DebugLocation(110, 4);
+				char_literal93=(IToken)Match(input,78,Follow._78_in_accessor680);  
+				stream_78.Add(char_literal93);
 
-				DebugLocation(86, 8);
-				// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:86:8: (func= ANY |func= ALL |func= COUNT |func= MAX |func= MIN |func= SUM |func= AVERAGE )
-				int alt18=7;
-				try { DebugEnterSubRule(18);
-				try { DebugEnterDecision(18, false);
+				DebugLocation(110, 8);
+				// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:110:8: (func= ANY |func= ALL |func= COUNT |func= MAX |func= MIN |func= SUM |func= AVERAGE )
+				int alt22=7;
+				try { DebugEnterSubRule(22);
+				try { DebugEnterDecision(22, false);
 				switch (input.LA(1))
 				{
 				case ANY:
 					{
-					alt18 = 1;
+					alt22 = 1;
 					}
 					break;
 				case ALL:
 					{
-					alt18 = 2;
+					alt22 = 2;
 					}
 					break;
 				case COUNT:
 					{
-					alt18 = 3;
+					alt22 = 3;
 					}
 					break;
 				case MAX:
 					{
-					alt18 = 4;
+					alt22 = 4;
 					}
 					break;
 				case MIN:
 					{
-					alt18 = 5;
+					alt22 = 5;
 					}
 					break;
 				case SUM:
 					{
-					alt18 = 6;
+					alt22 = 6;
 					}
 					break;
 				case AVERAGE:
 					{
-					alt18 = 7;
+					alt22 = 7;
 					}
 					break;
 				default:
 					{
-						NoViableAltException nvae = new NoViableAltException("", 18, 0, input, 1);
+						NoViableAltException nvae = new NoViableAltException("", 22, 0, input, 1);
 						DebugRecognitionException(nvae);
 						throw nvae;
 					}
 				}
 
-				} finally { DebugExitDecision(18); }
-				switch (alt18)
+				} finally { DebugExitDecision(22); }
+				switch (alt22)
 				{
 				case 1:
 					DebugEnterAlt(1);
-					// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:86:9: func= ANY
+					// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:110:9: func= ANY
 					{
-					DebugLocation(86, 13);
-					func=(IToken)Match(input,ANY,Follow._ANY_in_accessor532);  
+					DebugLocation(110, 13);
+					func=(IToken)Match(input,ANY,Follow._ANY_in_accessor685);  
 					stream_ANY.Add(func);
 
 
@@ -2556,10 +3317,10 @@ private AstParserRuleReturnScope<object, IToken> accessor(bool subquery)
 					break;
 				case 2:
 					DebugEnterAlt(2);
-					// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:86:20: func= ALL
+					// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:110:20: func= ALL
 					{
-					DebugLocation(86, 24);
-					func=(IToken)Match(input,ALL,Follow._ALL_in_accessor538);  
+					DebugLocation(110, 24);
+					func=(IToken)Match(input,ALL,Follow._ALL_in_accessor691);  
 					stream_ALL.Add(func);
 
 
@@ -2567,10 +3328,10 @@ private AstParserRuleReturnScope<object, IToken> accessor(bool subquery)
 					break;
 				case 3:
 					DebugEnterAlt(3);
-					// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:86:31: func= COUNT
+					// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:110:31: func= COUNT
 					{
-					DebugLocation(86, 35);
-					func=(IToken)Match(input,COUNT,Follow._COUNT_in_accessor544);  
+					DebugLocation(110, 35);
+					func=(IToken)Match(input,COUNT,Follow._COUNT_in_accessor697);  
 					stream_COUNT.Add(func);
 
 
@@ -2578,10 +3339,10 @@ private AstParserRuleReturnScope<object, IToken> accessor(bool subquery)
 					break;
 				case 4:
 					DebugEnterAlt(4);
-					// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:86:44: func= MAX
+					// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:110:44: func= MAX
 					{
-					DebugLocation(86, 48);
-					func=(IToken)Match(input,MAX,Follow._MAX_in_accessor550);  
+					DebugLocation(110, 48);
+					func=(IToken)Match(input,MAX,Follow._MAX_in_accessor703);  
 					stream_MAX.Add(func);
 
 
@@ -2589,10 +3350,10 @@ private AstParserRuleReturnScope<object, IToken> accessor(bool subquery)
 					break;
 				case 5:
 					DebugEnterAlt(5);
-					// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:86:55: func= MIN
+					// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:110:55: func= MIN
 					{
-					DebugLocation(86, 59);
-					func=(IToken)Match(input,MIN,Follow._MIN_in_accessor556);  
+					DebugLocation(110, 59);
+					func=(IToken)Match(input,MIN,Follow._MIN_in_accessor709);  
 					stream_MIN.Add(func);
 
 
@@ -2600,10 +3361,10 @@ private AstParserRuleReturnScope<object, IToken> accessor(bool subquery)
 					break;
 				case 6:
 					DebugEnterAlt(6);
-					// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:86:66: func= SUM
+					// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:110:66: func= SUM
 					{
-					DebugLocation(86, 70);
-					func=(IToken)Match(input,SUM,Follow._SUM_in_accessor562);  
+					DebugLocation(110, 70);
+					func=(IToken)Match(input,SUM,Follow._SUM_in_accessor715);  
 					stream_SUM.Add(func);
 
 
@@ -2611,10 +3372,10 @@ private AstParserRuleReturnScope<object, IToken> accessor(bool subquery)
 					break;
 				case 7:
 					DebugEnterAlt(7);
-					// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:86:77: func= AVERAGE
+					// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:110:77: func= AVERAGE
 					{
-					DebugLocation(86, 81);
-					func=(IToken)Match(input,AVERAGE,Follow._AVERAGE_in_accessor568);  
+					DebugLocation(110, 81);
+					func=(IToken)Match(input,AVERAGE,Follow._AVERAGE_in_accessor721);  
 					stream_AVERAGE.Add(func);
 
 
@@ -2622,63 +3383,63 @@ private AstParserRuleReturnScope<object, IToken> accessor(bool subquery)
 					break;
 
 				}
-				} finally { DebugExitSubRule(18); }
+				} finally { DebugExitSubRule(22); }
 
-				DebugLocation(87, 4);
-				char_literal65=(IToken)Match(input,71,Follow._71_in_accessor575);  
-				stream_71.Add(char_literal65);
+				DebugLocation(111, 4);
+				char_literal94=(IToken)Match(input,75,Follow._75_in_accessor728);  
+				stream_75.Add(char_literal94);
 
-				DebugLocation(87, 8);
-				// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:87:8: ( (id= IDENTIFIER ':' SPACE filterexpression[true] ) -> ^( $func $accessor ALIAS[$id] filterexpression ) | -> ^( $func $accessor) )
-				int alt19=2;
-				try { DebugEnterSubRule(19);
-				try { DebugEnterDecision(19, false);
-				int LA19_1 = input.LA(1);
+				DebugLocation(111, 8);
+				// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:111:8: ( (id= IDENTIFIER ':' SPACE filterexpression[true] ) -> ^( $func $accessor ALIAS[$id] filterexpression ) | -> ^( $func $accessor) )
+				int alt23=2;
+				try { DebugEnterSubRule(23);
+				try { DebugEnterDecision(23, false);
+				int LA23_1 = input.LA(1);
 
-				if ((LA19_1==IDENTIFIER))
+				if ((LA23_1==IDENTIFIER))
 				{
-					alt19 = 1;
+					alt23 = 1;
 				}
-				else if ((LA19_1==72))
+				else if ((LA23_1==76))
 				{
-					alt19 = 2;
+					alt23 = 2;
 				}
 				else
 				{
-					NoViableAltException nvae = new NoViableAltException("", 19, 0, input, 1);
+					NoViableAltException nvae = new NoViableAltException("", 23, 0, input, 1);
 					DebugRecognitionException(nvae);
 					throw nvae;
 				}
-				} finally { DebugExitDecision(19); }
-				switch (alt19)
+				} finally { DebugExitDecision(23); }
+				switch (alt23)
 				{
 				case 1:
 					DebugEnterAlt(1);
-					// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:88:5: (id= IDENTIFIER ':' SPACE filterexpression[true] )
+					// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:112:5: (id= IDENTIFIER ':' SPACE filterexpression[true] )
 					{
-					DebugLocation(88, 5);
-					// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:88:5: (id= IDENTIFIER ':' SPACE filterexpression[true] )
+					DebugLocation(112, 5);
+					// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:112:5: (id= IDENTIFIER ':' SPACE filterexpression[true] )
 					DebugEnterAlt(1);
-					// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:88:6: id= IDENTIFIER ':' SPACE filterexpression[true]
+					// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:112:6: id= IDENTIFIER ':' SPACE filterexpression[true]
 					{
-					DebugLocation(88, 8);
-					id=(IToken)Match(input,IDENTIFIER,Follow._IDENTIFIER_in_accessor586);  
+					DebugLocation(112, 8);
+					id=(IToken)Match(input,IDENTIFIER,Follow._IDENTIFIER_in_accessor739);  
 					stream_IDENTIFIER.Add(id);
 
-					DebugLocation(88, 20);
-					char_literal66=(IToken)Match(input,75,Follow._75_in_accessor588);  
-					stream_75.Add(char_literal66);
+					DebugLocation(112, 20);
+					char_literal95=(IToken)Match(input,79,Follow._79_in_accessor741);  
+					stream_79.Add(char_literal95);
 
-					DebugLocation(88, 24);
-					SPACE67=(IToken)Match(input,SPACE,Follow._SPACE_in_accessor590);  
-					stream_SPACE.Add(SPACE67);
+					DebugLocation(112, 24);
+					SPACE96=(IToken)Match(input,SPACE,Follow._SPACE_in_accessor743);  
+					stream_SPACE.Add(SPACE96);
 
-					DebugLocation(88, 30);
-					PushFollow(Follow._filterexpression_in_accessor592);
-					filterexpression68=filterexpression(true);
+					DebugLocation(112, 30);
+					PushFollow(Follow._filterexpression_in_accessor745);
+					filterexpression97=filterexpression(true);
 					PopFollow();
 
-					stream_filterexpression.Add(filterexpression68.Tree);
+					stream_filterexpression.Add(filterexpression97.Tree);
 
 					}
 
@@ -2697,20 +3458,20 @@ private AstParserRuleReturnScope<object, IToken> accessor(bool subquery)
 					RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.Tree:null);
 
 					root_0 = (object)adaptor.Nil();
-					// 88:54: -> ^( $func $accessor ALIAS[$id] filterexpression )
+					// 112:54: -> ^( $func $accessor ALIAS[$id] filterexpression )
 					{
-						DebugLocation(88, 57);
-						// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:88:57: ^( $func $accessor ALIAS[$id] filterexpression )
+						DebugLocation(112, 57);
+						// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:112:57: ^( $func $accessor ALIAS[$id] filterexpression )
 						{
 						object root_1 = (object)adaptor.Nil();
-						DebugLocation(88, 60);
+						DebugLocation(112, 60);
 						root_1 = (object)adaptor.BecomeRoot(stream_func.NextNode(), root_1);
 
-						DebugLocation(88, 66);
+						DebugLocation(112, 66);
 						adaptor.AddChild(root_1, stream_retval.NextTree());
-						DebugLocation(88, 75);
+						DebugLocation(112, 75);
 						adaptor.AddChild(root_1, (object)adaptor.Create(ALIAS, id));
-						DebugLocation(88, 86);
+						DebugLocation(112, 86);
 						adaptor.AddChild(root_1, stream_filterexpression.NextTree());
 
 						adaptor.AddChild(root_0, root_1);
@@ -2725,7 +3486,7 @@ private AstParserRuleReturnScope<object, IToken> accessor(bool subquery)
 					break;
 				case 2:
 					DebugEnterAlt(2);
-					// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:89:7: 
+					// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:113:7: 
 					{
 
 					{
@@ -2741,16 +3502,16 @@ private AstParserRuleReturnScope<object, IToken> accessor(bool subquery)
 					RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.Tree:null);
 
 					root_0 = (object)adaptor.Nil();
-					// 89:7: -> ^( $func $accessor)
+					// 113:7: -> ^( $func $accessor)
 					{
-						DebugLocation(89, 10);
-						// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:89:10: ^( $func $accessor)
+						DebugLocation(113, 10);
+						// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:113:10: ^( $func $accessor)
 						{
 						object root_1 = (object)adaptor.Nil();
-						DebugLocation(89, 13);
+						DebugLocation(113, 13);
 						root_1 = (object)adaptor.BecomeRoot(stream_func.NextNode(), root_1);
 
-						DebugLocation(89, 19);
+						DebugLocation(113, 19);
 						adaptor.AddChild(root_1, stream_retval.NextTree());
 
 						adaptor.AddChild(root_0, root_1);
@@ -2765,18 +3526,18 @@ private AstParserRuleReturnScope<object, IToken> accessor(bool subquery)
 					break;
 
 				}
-				} finally { DebugExitSubRule(19); }
+				} finally { DebugExitSubRule(23); }
 
-				DebugLocation(90, 4);
-				char_literal69=(IToken)Match(input,72,Follow._72_in_accessor632);  
-				stream_72.Add(char_literal69);
+				DebugLocation(114, 4);
+				char_literal98=(IToken)Match(input,76,Follow._76_in_accessor785);  
+				stream_76.Add(char_literal98);
 
 
 				}
 				break;
 
 			}
-			} finally { DebugExitSubRule(20); }
+			} finally { DebugExitSubRule(24); }
 
 
 			}
@@ -2796,11 +3557,11 @@ private AstParserRuleReturnScope<object, IToken> accessor(bool subquery)
 		}
 		finally
 		{
-			TraceOut("accessor", 16);
-			LeaveRule("accessor", 16);
+			TraceOut("accessor", 24);
+			LeaveRule("accessor", 24);
 			LeaveRule_accessor();
 		}
-		DebugLocation(91, 4);
+		DebugLocation(115, 4);
 		} finally { DebugExitRule(GrammarFileName, "accessor"); }
 		return retval;
 
@@ -2810,38 +3571,38 @@ private AstParserRuleReturnScope<object, IToken> accessor(bool subquery)
 	partial void EnterRule_function();
 	partial void LeaveRule_function();
 	// $ANTLR start "function"
-	// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:93:1: function : ( STARTSWITH | ENDSWITH | SUBSTRINGOF | TOLOWER | TOUPPER | YEAR | YEARS | MONTH | DAY | DAYS | HOUR | HOURS | MINUTE | MINUTES | SECOND | SECONDS );
+	// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:117:1: function : ( STARTSWITH | ENDSWITH | SUBSTRINGOF | TOLOWER | TOUPPER | YEAR | YEARS | MONTH | DAY | DAYS | HOUR | HOURS | MINUTE | MINUTES | SECOND | SECONDS );
 	[GrammarRule("function")]
 	private AstParserRuleReturnScope<object, IToken> function()
 	{
 		EnterRule_function();
-		EnterRule("function", 17);
-		TraceIn("function", 17);
+		EnterRule("function", 25);
+		TraceIn("function", 25);
 		AstParserRuleReturnScope<object, IToken> retval = new AstParserRuleReturnScope<object, IToken>();
 		retval.Start = (IToken)input.LT(1);
 
 		object root_0 = default(object);
 
-		IToken set70 = default(IToken);
+		IToken set99 = default(IToken);
 
-		object set70_tree = default(object);
+		object set99_tree = default(object);
 		try { DebugEnterRule(GrammarFileName, "function");
-		DebugLocation(93, 147);
+		DebugLocation(117, 147);
 		try
 		{
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:94:2: ( STARTSWITH | ENDSWITH | SUBSTRINGOF | TOLOWER | TOUPPER | YEAR | YEARS | MONTH | DAY | DAYS | HOUR | HOURS | MINUTE | MINUTES | SECOND | SECONDS )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:118:2: ( STARTSWITH | ENDSWITH | SUBSTRINGOF | TOLOWER | TOUPPER | YEAR | YEARS | MONTH | DAY | DAYS | HOUR | HOURS | MINUTE | MINUTES | SECOND | SECONDS )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:
 			{
 			root_0 = (object)adaptor.Nil();
 
-			DebugLocation(94, 2);
+			DebugLocation(118, 2);
 
-			set70=(IToken)input.LT(1);
+			set99=(IToken)input.LT(1);
 			if ((input.LA(1)>=DAY && input.LA(1)<=DAYS)||input.LA(1)==ENDSWITH||(input.LA(1)>=HOUR && input.LA(1)<=HOURS)||(input.LA(1)>=MINUTE && input.LA(1)<=MONTH)||(input.LA(1)>=SECOND && input.LA(1)<=SECONDS)||input.LA(1)==STARTSWITH||input.LA(1)==SUBSTRINGOF||input.LA(1)==TOLOWER||input.LA(1)==TOUPPER||(input.LA(1)>=YEAR && input.LA(1)<=YEARS))
 			{
 				input.Consume();
-				adaptor.AddChild(root_0, (object)adaptor.Create(set70));
+				adaptor.AddChild(root_0, (object)adaptor.Create(set99));
 				state.errorRecovery=false;
 			}
 			else
@@ -2869,11 +3630,11 @@ private AstParserRuleReturnScope<object, IToken> function()
 		}
 		finally
 		{
-			TraceOut("function", 17);
-			LeaveRule("function", 17);
+			TraceOut("function", 25);
+			LeaveRule("function", 25);
 			LeaveRule_function();
 		}
-		DebugLocation(94, 147);
+		DebugLocation(118, 147);
 		} finally { DebugExitRule(GrammarFileName, "function"); }
 		return retval;
 
@@ -2883,42 +3644,42 @@ private AstParserRuleReturnScope<object, IToken> function()
 	partial void EnterRule_orderby();
 	partial void LeaveRule_orderby();
 	// $ANTLR start "orderby"
-	// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:96:1: orderby : ORDERBY ^ orderbylist ;
+	// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:120:1: orderby : ORDERBY ^ orderbylist ;
 	[GrammarRule("orderby")]
 	private AstParserRuleReturnScope<object, IToken> orderby()
 	{
 		EnterRule_orderby();
-		EnterRule("orderby", 18);
-		TraceIn("orderby", 18);
+		EnterRule("orderby", 26);
+		TraceIn("orderby", 26);
 		AstParserRuleReturnScope<object, IToken> retval = new AstParserRuleReturnScope<object, IToken>();
 		retval.Start = (IToken)input.LT(1);
 
 		object root_0 = default(object);
 
-		IToken ORDERBY71 = default(IToken);
-		AstParserRuleReturnScope<object, IToken> orderbylist72 = default(AstParserRuleReturnScope<object, IToken>);
+		IToken ORDERBY100 = default(IToken);
+		AstParserRuleReturnScope<object, IToken> orderbylist101 = default(AstParserRuleReturnScope<object, IToken>);
 
-		object ORDERBY71_tree = default(object);
+		object ORDERBY100_tree = default(object);
 		try { DebugEnterRule(GrammarFileName, "orderby");
-		DebugLocation(96, 23);
+		DebugLocation(120, 23);
 		try
 		{
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:97:2: ( ORDERBY ^ orderbylist )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:121:2: ( ORDERBY ^ orderbylist )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:97:4: ORDERBY ^ orderbylist
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:121:4: ORDERBY ^ orderbylist
 			{
 			root_0 = (object)adaptor.Nil();
 
-			DebugLocation(97, 11);
-			ORDERBY71=(IToken)Match(input,ORDERBY,Follow._ORDERBY_in_orderby719); 
-			ORDERBY71_tree = (object)adaptor.Create(ORDERBY71);
-			root_0 = (object)adaptor.BecomeRoot(ORDERBY71_tree, root_0);
-			DebugLocation(97, 13);
-			PushFollow(Follow._orderbylist_in_orderby722);
-			orderbylist72=orderbylist();
+			DebugLocation(121, 11);
+			ORDERBY100=(IToken)Match(input,ORDERBY,Follow._ORDERBY_in_orderby872); 
+			ORDERBY100_tree = (object)adaptor.Create(ORDERBY100);
+			root_0 = (object)adaptor.BecomeRoot(ORDERBY100_tree, root_0);
+			DebugLocation(121, 13);
+			PushFollow(Follow._orderbylist_in_orderby875);
+			orderbylist101=orderbylist();
 			PopFollow();
 
-			adaptor.AddChild(root_0, orderbylist72.Tree);
+			adaptor.AddChild(root_0, orderbylist101.Tree);
 
 			}
 
@@ -2937,11 +3698,11 @@ private AstParserRuleReturnScope<object, IToken> orderby()
 		}
 		finally
 		{
-			TraceOut("orderby", 18);
-			LeaveRule("orderby", 18);
+			TraceOut("orderby", 26);
+			LeaveRule("orderby", 26);
 			LeaveRule_orderby();
 		}
-		DebugLocation(97, 23);
+		DebugLocation(121, 23);
 		} finally { DebugExitRule(GrammarFileName, "orderby"); }
 		return retval;
 
@@ -2951,82 +3712,82 @@ private AstParserRuleReturnScope<object, IToken> orderby()
 	partial void EnterRule_orderbylist();
 	partial void LeaveRule_orderbylist();
 	// $ANTLR start "orderbylist"
-	// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:99:1: orderbylist : orderpropertyname ( ',' ! orderpropertyname )* ;
+	// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:123:1: orderbylist : orderpropertyname ( ',' ! orderpropertyname )* ;
 	[GrammarRule("orderbylist")]
 	private AstParserRuleReturnScope<object, IToken> orderbylist()
 	{
 		EnterRule_orderbylist();
-		EnterRule("orderbylist", 19);
-		TraceIn("orderbylist", 19);
+		EnterRule("orderbylist", 27);
+		TraceIn("orderbylist", 27);
 		AstParserRuleReturnScope<object, IToken> retval = new AstParserRuleReturnScope<object, IToken>();
 		retval.Start = (IToken)input.LT(1);
 
 		object root_0 = default(object);
 
-		IToken char_literal74 = default(IToken);
-		AstParserRuleReturnScope<object, IToken> orderpropertyname73 = default(AstParserRuleReturnScope<object, IToken>);
-		AstParserRuleReturnScope<object, IToken> orderpropertyname75 = default(AstParserRuleReturnScope<object, IToken>);
+		IToken char_literal103 = default(IToken);
+		AstParserRuleReturnScope<object, IToken> orderpropertyname102 = default(AstParserRuleReturnScope<object, IToken>);
+		AstParserRuleReturnScope<object, IToken> orderpropertyname104 = default(AstParserRuleReturnScope<object, IToken>);
 
-		object char_literal74_tree = default(object);
+		object char_literal103_tree = default(object);
 		try { DebugEnterRule(GrammarFileName, "orderbylist");
-		DebugLocation(99, 46);
+		DebugLocation(123, 46);
 		try
 		{
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:100:2: ( orderpropertyname ( ',' ! orderpropertyname )* )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:124:2: ( orderpropertyname ( ',' ! orderpropertyname )* )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:100:4: orderpropertyname ( ',' ! orderpropertyname )*
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:124:4: orderpropertyname ( ',' ! orderpropertyname )*
 			{
 			root_0 = (object)adaptor.Nil();
 
-			DebugLocation(100, 4);
-			PushFollow(Follow._orderpropertyname_in_orderbylist732);
-			orderpropertyname73=orderpropertyname();
+			DebugLocation(124, 4);
+			PushFollow(Follow._orderpropertyname_in_orderbylist885);
+			orderpropertyname102=orderpropertyname();
 			PopFollow();
 
-			adaptor.AddChild(root_0, orderpropertyname73.Tree);
-			DebugLocation(100, 22);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:100:22: ( ',' ! orderpropertyname )*
-			try { DebugEnterSubRule(21);
+			adaptor.AddChild(root_0, orderpropertyname102.Tree);
+			DebugLocation(124, 22);
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:124:22: ( ',' ! orderpropertyname )*
+			try { DebugEnterSubRule(25);
 			while (true)
 			{
-				int alt21=2;
-				try { DebugEnterDecision(21, false);
-				int LA21_1 = input.LA(1);
+				int alt25=2;
+				try { DebugEnterDecision(25, false);
+				int LA25_1 = input.LA(1);
 
-				if ((LA21_1==73))
+				if ((LA25_1==77))
 				{
-					alt21 = 1;
+					alt25 = 1;
 				}
 
 
-				} finally { DebugExitDecision(21); }
-				switch ( alt21 )
+				} finally { DebugExitDecision(25); }
+				switch ( alt25 )
 				{
 				case 1:
 					DebugEnterAlt(1);
-					// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:100:23: ',' ! orderpropertyname
+					// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:124:23: ',' ! orderpropertyname
 					{
-					DebugLocation(100, 26);
-					char_literal74=(IToken)Match(input,73,Follow._73_in_orderbylist735); 
-					DebugLocation(100, 28);
-					PushFollow(Follow._orderpropertyname_in_orderbylist738);
-					orderpropertyname75=orderpropertyname();
+					DebugLocation(124, 26);
+					char_literal103=(IToken)Match(input,77,Follow._77_in_orderbylist888); 
+					DebugLocation(124, 28);
+					PushFollow(Follow._orderpropertyname_in_orderbylist891);
+					orderpropertyname104=orderpropertyname();
 					PopFollow();
 
-					adaptor.AddChild(root_0, orderpropertyname75.Tree);
+					adaptor.AddChild(root_0, orderpropertyname104.Tree);
 
 					}
 					break;
 
 				default:
-					goto loop21;
+					goto loop25;
 				}
 			}
 
-			loop21:
+			loop25:
 				;
 
-			} finally { DebugExitSubRule(21); }
+			} finally { DebugExitSubRule(25); }
 
 
 			}
@@ -3046,11 +3807,11 @@ private AstParserRuleReturnScope<object, IToken> orderbylist()
 		}
 		finally
 		{
-			TraceOut("orderbylist", 19);
-			LeaveRule("orderbylist", 19);
+			TraceOut("orderbylist", 27);
+			LeaveRule("orderbylist", 27);
 			LeaveRule_orderbylist();
 		}
-		DebugLocation(100, 46);
+		DebugLocation(124, 46);
 		} finally { DebugExitRule(GrammarFileName, "orderbylist"); }
 		return retval;
 
@@ -3060,69 +3821,69 @@ private AstParserRuleReturnScope<object, IToken> orderbylist()
 	partial void EnterRule_orderpropertyname();
 	partial void LeaveRule_orderpropertyname();
 	// $ANTLR start "orderpropertyname"
-	// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:102:1: orderpropertyname : propertyname[false] ( -> ^( ASC[\"asc\"] propertyname ) | ( SPACE (op= ASC |op= DESC ) ) -> ^( $op propertyname ) ) ;
+	// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:126:1: orderpropertyname : propertyname[false] ( -> ^( ASC[\"asc\"] propertyname ) | ( SPACE (op= ASC |op= DESC ) ) -> ^( $op propertyname ) ) ;
 	[GrammarRule("orderpropertyname")]
 	private AstParserRuleReturnScope<object, IToken> orderpropertyname()
 	{
 		EnterRule_orderpropertyname();
-		EnterRule("orderpropertyname", 20);
-		TraceIn("orderpropertyname", 20);
+		EnterRule("orderpropertyname", 28);
+		TraceIn("orderpropertyname", 28);
 		AstParserRuleReturnScope<object, IToken> retval = new AstParserRuleReturnScope<object, IToken>();
 		retval.Start = (IToken)input.LT(1);
 
 		object root_0 = default(object);
 
 		IToken op = default(IToken);
-		IToken SPACE77 = default(IToken);
-		AstParserRuleReturnScope<object, IToken> propertyname76 = default(AstParserRuleReturnScope<object, IToken>);
+		IToken SPACE106 = default(IToken);
+		AstParserRuleReturnScope<object, IToken> propertyname105 = default(AstParserRuleReturnScope<object, IToken>);
 
 		object op_tree = default(object);
-		object SPACE77_tree = default(object);
+		object SPACE106_tree = default(object);
 		RewriteRuleITokenStream stream_SPACE=new RewriteRuleITokenStream(adaptor,"token SPACE");
 		RewriteRuleITokenStream stream_ASC=new RewriteRuleITokenStream(adaptor,"token ASC");
 		RewriteRuleITokenStream stream_DESC=new RewriteRuleITokenStream(adaptor,"token DESC");
 		RewriteRuleSubtreeStream stream_propertyname=new RewriteRuleSubtreeStream(adaptor,"rule propertyname");
 		try { DebugEnterRule(GrammarFileName, "orderpropertyname");
-		DebugLocation(102, 3);
+		DebugLocation(126, 3);
 		try
 		{
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:103:2: ( propertyname[false] ( -> ^( ASC[\"asc\"] propertyname ) | ( SPACE (op= ASC |op= DESC ) ) -> ^( $op propertyname ) ) )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:127:2: ( propertyname[false] ( -> ^( ASC[\"asc\"] propertyname ) | ( SPACE (op= ASC |op= DESC ) ) -> ^( $op propertyname ) ) )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:103:4: propertyname[false] ( -> ^( ASC[\"asc\"] propertyname ) | ( SPACE (op= ASC |op= DESC ) ) -> ^( $op propertyname ) )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:127:4: propertyname[false] ( -> ^( ASC[\"asc\"] propertyname ) | ( SPACE (op= ASC |op= DESC ) ) -> ^( $op propertyname ) )
 			{
-			DebugLocation(103, 4);
-			PushFollow(Follow._propertyname_in_orderpropertyname749);
-			propertyname76=propertyname(false);
+			DebugLocation(127, 4);
+			PushFollow(Follow._propertyname_in_orderpropertyname902);
+			propertyname105=propertyname(false);
 			PopFollow();
 
-			stream_propertyname.Add(propertyname76.Tree);
-			DebugLocation(103, 24);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:103:24: ( -> ^( ASC[\"asc\"] propertyname ) | ( SPACE (op= ASC |op= DESC ) ) -> ^( $op propertyname ) )
-			int alt23=2;
-			try { DebugEnterSubRule(23);
-			try { DebugEnterDecision(23, false);
-			int LA23_1 = input.LA(1);
+			stream_propertyname.Add(propertyname105.Tree);
+			DebugLocation(127, 24);
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:127:24: ( -> ^( ASC[\"asc\"] propertyname ) | ( SPACE (op= ASC |op= DESC ) ) -> ^( $op propertyname ) )
+			int alt27=2;
+			try { DebugEnterSubRule(27);
+			try { DebugEnterDecision(27, false);
+			int LA27_1 = input.LA(1);
 
-			if ((LA23_1==EOF||(LA23_1>=EXPAND && LA23_1<=FILTER)||(LA23_1>=IGNORED && LA23_1<=INLINECOUNT)||LA23_1==ORDERBY||LA23_1==SELECT||LA23_1==SKIP||LA23_1==TOP||LA23_1==70||LA23_1==73))
+			if ((LA27_1==EOF||LA27_1==APPLY||(LA27_1>=EXPAND && LA27_1<=FILTER)||(LA27_1>=IGNORED && LA27_1<=INLINECOUNT)||LA27_1==ORDERBY||LA27_1==SELECT||LA27_1==SKIP||LA27_1==TOP||LA27_1==74||LA27_1==77))
 			{
-				alt23 = 1;
+				alt27 = 1;
 			}
-			else if ((LA23_1==SPACE))
+			else if ((LA27_1==SPACE))
 			{
-				alt23 = 2;
+				alt27 = 2;
 			}
 			else
 			{
-				NoViableAltException nvae = new NoViableAltException("", 23, 0, input, 1);
+				NoViableAltException nvae = new NoViableAltException("", 27, 0, input, 1);
 				DebugRecognitionException(nvae);
 				throw nvae;
 			}
-			} finally { DebugExitDecision(23); }
-			switch (alt23)
+			} finally { DebugExitDecision(27); }
+			switch (alt27)
 			{
 			case 1:
 				DebugEnterAlt(1);
-				// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:104:4: 
+				// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:128:4: 
 				{
 
 				{
@@ -3137,16 +3898,16 @@ private AstParserRuleReturnScope<object, IToken> orderpropertyname()
 				RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.Tree:null);
 
 				root_0 = (object)adaptor.Nil();
-				// 104:4: -> ^( ASC[\"asc\"] propertyname )
+				// 128:4: -> ^( ASC[\"asc\"] propertyname )
 				{
-					DebugLocation(104, 7);
-					// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:104:7: ^( ASC[\"asc\"] propertyname )
+					DebugLocation(128, 7);
+					// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:128:7: ^( ASC[\"asc\"] propertyname )
 					{
 					object root_1 = (object)adaptor.Nil();
-					DebugLocation(104, 9);
+					DebugLocation(128, 9);
 					root_1 = (object)adaptor.BecomeRoot((object)adaptor.Create(ASC, "asc"), root_1);
 
-					DebugLocation(104, 20);
+					DebugLocation(128, 20);
 					adaptor.AddChild(root_1, stream_propertyname.NextTree());
 
 					adaptor.AddChild(root_0, root_1);
@@ -3161,47 +3922,47 @@ private AstParserRuleReturnScope<object, IToken> orderpropertyname()
 				break;
 			case 2:
 				DebugEnterAlt(2);
-				// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:105:6: ( SPACE (op= ASC |op= DESC ) )
+				// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:129:6: ( SPACE (op= ASC |op= DESC ) )
 				{
-				DebugLocation(105, 6);
-				// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:105:6: ( SPACE (op= ASC |op= DESC ) )
+				DebugLocation(129, 6);
+				// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:129:6: ( SPACE (op= ASC |op= DESC ) )
 				DebugEnterAlt(1);
-				// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:105:7: SPACE (op= ASC |op= DESC )
+				// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:129:7: SPACE (op= ASC |op= DESC )
 				{
-				DebugLocation(105, 7);
-				SPACE77=(IToken)Match(input,SPACE,Follow._SPACE_in_orderpropertyname772);  
-				stream_SPACE.Add(SPACE77);
-
-				DebugLocation(105, 13);
-				// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:105:13: (op= ASC |op= DESC )
-				int alt22=2;
-				try { DebugEnterSubRule(22);
-				try { DebugEnterDecision(22, false);
-				int LA22_1 = input.LA(1);
-
-				if ((LA22_1==ASC))
+				DebugLocation(129, 7);
+				SPACE106=(IToken)Match(input,SPACE,Follow._SPACE_in_orderpropertyname925);  
+				stream_SPACE.Add(SPACE106);
+
+				DebugLocation(129, 13);
+				// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:129:13: (op= ASC |op= DESC )
+				int alt26=2;
+				try { DebugEnterSubRule(26);
+				try { DebugEnterDecision(26, false);
+				int LA26_1 = input.LA(1);
+
+				if ((LA26_1==ASC))
 				{
-					alt22 = 1;
+					alt26 = 1;
 				}
-				else if ((LA22_1==DESC))
+				else if ((LA26_1==DESC))
 				{
-					alt22 = 2;
+					alt26 = 2;
 				}
 				else
 				{
-					NoViableAltException nvae = new NoViableAltException("", 22, 0, input, 1);
+					NoViableAltException nvae = new NoViableAltException("", 26, 0, input, 1);
 					DebugRecognitionException(nvae);
 					throw nvae;
 				}
-				} finally { DebugExitDecision(22); }
-				switch (alt22)
+				} finally { DebugExitDecision(26); }
+				switch (alt26)
 				{
 				case 1:
 					DebugEnterAlt(1);
-					// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:105:14: op= ASC
+					// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:129:14: op= ASC
 					{
-					DebugLocation(105, 16);
-					op=(IToken)Match(input,ASC,Follow._ASC_in_orderpropertyname777);  
+					DebugLocation(129, 16);
+					op=(IToken)Match(input,ASC,Follow._ASC_in_orderpropertyname930);  
 					stream_ASC.Add(op);
 
 
@@ -3209,10 +3970,10 @@ private AstParserRuleReturnScope<object, IToken> orderpropertyname()
 					break;
 				case 2:
 					DebugEnterAlt(2);
-					// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:105:23: op= DESC
+					// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:129:23: op= DESC
 					{
-					DebugLocation(105, 25);
-					op=(IToken)Match(input,DESC,Follow._DESC_in_orderpropertyname783);  
+					DebugLocation(129, 25);
+					op=(IToken)Match(input,DESC,Follow._DESC_in_orderpropertyname936);  
 					stream_DESC.Add(op);
 
 
@@ -3220,7 +3981,7 @@ private AstParserRuleReturnScope<object, IToken> orderpropertyname()
 					break;
 
 				}
-				} finally { DebugExitSubRule(22); }
+				} finally { DebugExitSubRule(26); }
 
 
 				}
@@ -3240,16 +4001,16 @@ private AstParserRuleReturnScope<object, IToken> orderpropertyname()
 				RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.Tree:null);
 
 				root_0 = (object)adaptor.Nil();
-				// 105:33: -> ^( $op propertyname )
+				// 129:33: -> ^( $op propertyname )
 				{
-					DebugLocation(105, 36);
-					// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:105:36: ^( $op propertyname )
+					DebugLocation(129, 36);
+					// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:129:36: ^( $op propertyname )
 					{
 					object root_1 = (object)adaptor.Nil();
-					DebugLocation(105, 39);
+					DebugLocation(129, 39);
 					root_1 = (object)adaptor.BecomeRoot(stream_op.NextNode(), root_1);
 
-					DebugLocation(105, 42);
+					DebugLocation(129, 42);
 					adaptor.AddChild(root_1, stream_propertyname.NextTree());
 
 					adaptor.AddChild(root_0, root_1);
@@ -3264,7 +4025,7 @@ private AstParserRuleReturnScope<object, IToken> orderpropertyname()
 				break;
 
 			}
-			} finally { DebugExitSubRule(23); }
+			} finally { DebugExitSubRule(27); }
 
 
 			}
@@ -3284,11 +4045,11 @@ private AstParserRuleReturnScope<object, IToken> orderpropertyname()
 		}
 		finally
 		{
-			TraceOut("orderpropertyname", 20);
-			LeaveRule("orderpropertyname", 20);
+			TraceOut("orderpropertyname", 28);
+			LeaveRule("orderpropertyname", 28);
 			LeaveRule_orderpropertyname();
 		}
-		DebugLocation(106, 3);
+		DebugLocation(130, 3);
 		} finally { DebugExitRule(GrammarFileName, "orderpropertyname"); }
 		return retval;
 
@@ -3298,248 +4059,248 @@ private AstParserRuleReturnScope<object, IToken> orderpropertyname()
 	partial void EnterRule_constant();
 	partial void LeaveRule_constant();
 	// $ANTLR start "constant"
-	// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:108:1: constant : ( INT ^| BOOL ^| STRING ^| DATETIME ^| LONG ^| SINGLE ^| DECIMAL ^| DOUBLE ^| GUID ^| BYTE ^| NULL ^) ;
+	// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:132:1: constant : ( INT ^| BOOL ^| STRING ^| DATETIME ^| LONG ^| SINGLE ^| DECIMAL ^| DOUBLE ^| GUID ^| BYTE ^| NULL ^) ;
 	[GrammarRule("constant")]
 	private AstParserRuleReturnScope<object, IToken> constant()
 	{
 		EnterRule_constant();
-		EnterRule("constant", 21);
-		TraceIn("constant", 21);
+		EnterRule("constant", 29);
+		TraceIn("constant", 29);
 		AstParserRuleReturnScope<object, IToken> retval = new AstParserRuleReturnScope<object, IToken>();
 		retval.Start = (IToken)input.LT(1);
 
 		object root_0 = default(object);
 
-		IToken INT78 = default(IToken);
-		IToken BOOL79 = default(IToken);
-		IToken STRING80 = default(IToken);
-		IToken DATETIME81 = default(IToken);
-		IToken LONG82 = default(IToken);
-		IToken SINGLE83 = default(IToken);
-		IToken DECIMAL84 = default(IToken);
-		IToken DOUBLE85 = default(IToken);
-		IToken GUID86 = default(IToken);
-		IToken BYTE87 = default(IToken);
-		IToken NULL88 = default(IToken);
-
-		object INT78_tree = default(object);
-		object BOOL79_tree = default(object);
-		object STRING80_tree = default(object);
-		object DATETIME81_tree = default(object);
-		object LONG82_tree = default(object);
-		object SINGLE83_tree = default(object);
-		object DECIMAL84_tree = default(object);
-		object DOUBLE85_tree = default(object);
-		object GUID86_tree = default(object);
-		object BYTE87_tree = default(object);
-		object NULL88_tree = default(object);
+		IToken INT107 = default(IToken);
+		IToken BOOL108 = default(IToken);
+		IToken STRING109 = default(IToken);
+		IToken DATETIME110 = default(IToken);
+		IToken LONG111 = default(IToken);
+		IToken SINGLE112 = default(IToken);
+		IToken DECIMAL113 = default(IToken);
+		IToken DOUBLE114 = default(IToken);
+		IToken GUID115 = default(IToken);
+		IToken BYTE116 = default(IToken);
+		IToken NULL117 = default(IToken);
+
+		object INT107_tree = default(object);
+		object BOOL108_tree = default(object);
+		object STRING109_tree = default(object);
+		object DATETIME110_tree = default(object);
+		object LONG111_tree = default(object);
+		object SINGLE112_tree = default(object);
+		object DECIMAL113_tree = default(object);
+		object DOUBLE114_tree = default(object);
+		object GUID115_tree = default(object);
+		object BYTE116_tree = default(object);
+		object NULL117_tree = default(object);
 		try { DebugEnterRule(GrammarFileName, "constant");
-		DebugLocation(108, 109);
+		DebugLocation(132, 109);
 		try
 		{
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:108:9: ( ( INT ^| BOOL ^| STRING ^| DATETIME ^| LONG ^| SINGLE ^| DECIMAL ^| DOUBLE ^| GUID ^| BYTE ^| NULL ^) )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:132:9: ( ( INT ^| BOOL ^| STRING ^| DATETIME ^| LONG ^| SINGLE ^| DECIMAL ^| DOUBLE ^| GUID ^| BYTE ^| NULL ^) )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:108:11: ( INT ^| BOOL ^| STRING ^| DATETIME ^| LONG ^| SINGLE ^| DECIMAL ^| DOUBLE ^| GUID ^| BYTE ^| NULL ^)
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:132:11: ( INT ^| BOOL ^| STRING ^| DATETIME ^| LONG ^| SINGLE ^| DECIMAL ^| DOUBLE ^| GUID ^| BYTE ^| NULL ^)
 			{
 			root_0 = (object)adaptor.Nil();
 
-			DebugLocation(108, 11);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:108:11: ( INT ^| BOOL ^| STRING ^| DATETIME ^| LONG ^| SINGLE ^| DECIMAL ^| DOUBLE ^| GUID ^| BYTE ^| NULL ^)
-			int alt24=11;
-			try { DebugEnterSubRule(24);
-			try { DebugEnterDecision(24, false);
+			DebugLocation(132, 11);
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:132:11: ( INT ^| BOOL ^| STRING ^| DATETIME ^| LONG ^| SINGLE ^| DECIMAL ^| DOUBLE ^| GUID ^| BYTE ^| NULL ^)
+			int alt28=11;
+			try { DebugEnterSubRule(28);
+			try { DebugEnterDecision(28, false);
 			switch (input.LA(1))
 			{
 			case INT:
 				{
-				alt24 = 1;
+				alt28 = 1;
 				}
 				break;
 			case BOOL:
 				{
-				alt24 = 2;
+				alt28 = 2;
 				}
 				break;
 			case STRING:
 				{
-				alt24 = 3;
+				alt28 = 3;
 				}
 				break;
 			case DATETIME:
 				{
-				alt24 = 4;
+				alt28 = 4;
 				}
 				break;
 			case LONG:
 				{
-				alt24 = 5;
+				alt28 = 5;
 				}
 				break;
 			case SINGLE:
 				{
-				alt24 = 6;
+				alt28 = 6;
 				}
 				break;
 			case DECIMAL:
 				{
-				alt24 = 7;
+				alt28 = 7;
 				}
 				break;
 			case DOUBLE:
 				{
-				alt24 = 8;
+				alt28 = 8;
 				}
 				break;
 			case GUID:
 				{
-				alt24 = 9;
+				alt28 = 9;
 				}
 				break;
 			case BYTE:
 				{
-				alt24 = 10;
+				alt28 = 10;
 				}
 				break;
 			case NULL:
 				{
-				alt24 = 11;
+				alt28 = 11;
 				}
 				break;
 			default:
 				{
-					NoViableAltException nvae = new NoViableAltException("", 24, 0, input, 1);
+					NoViableAltException nvae = new NoViableAltException("", 28, 0, input, 1);
 					DebugRecognitionException(nvae);
 					throw nvae;
 				}
 			}
 
-			} finally { DebugExitDecision(24); }
-			switch (alt24)
+			} finally { DebugExitDecision(28); }
+			switch (alt28)
 			{
 			case 1:
 				DebugEnterAlt(1);
-				// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:108:12: INT ^
+				// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:132:12: INT ^
 				{
-				DebugLocation(108, 15);
-				INT78=(IToken)Match(input,INT,Follow._INT_in_constant807); 
-				INT78_tree = (object)adaptor.Create(INT78);
-				root_0 = (object)adaptor.BecomeRoot(INT78_tree, root_0);
+				DebugLocation(132, 15);
+				INT107=(IToken)Match(input,INT,Follow._INT_in_constant960); 
+				INT107_tree = (object)adaptor.Create(INT107);
+				root_0 = (object)adaptor.BecomeRoot(INT107_tree, root_0);
 
 				}
 				break;
 			case 2:
 				DebugEnterAlt(2);
-				// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:108:19: BOOL ^
+				// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:132:19: BOOL ^
 				{
-				DebugLocation(108, 23);
-				BOOL79=(IToken)Match(input,BOOL,Follow._BOOL_in_constant812); 
-				BOOL79_tree = (object)adaptor.Create(BOOL79);
-				root_0 = (object)adaptor.BecomeRoot(BOOL79_tree, root_0);
+				DebugLocation(132, 23);
+				BOOL108=(IToken)Match(input,BOOL,Follow._BOOL_in_constant965); 
+				BOOL108_tree = (object)adaptor.Create(BOOL108);
+				root_0 = (object)adaptor.BecomeRoot(BOOL108_tree, root_0);
 
 				}
 				break;
 			case 3:
 				DebugEnterAlt(3);
-				// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:108:27: STRING ^
+				// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:132:27: STRING ^
 				{
-				DebugLocation(108, 33);
-				STRING80=(IToken)Match(input,STRING,Follow._STRING_in_constant817); 
-				STRING80_tree = (object)adaptor.Create(STRING80);
-				root_0 = (object)adaptor.BecomeRoot(STRING80_tree, root_0);
+				DebugLocation(132, 33);
+				STRING109=(IToken)Match(input,STRING,Follow._STRING_in_constant970); 
+				STRING109_tree = (object)adaptor.Create(STRING109);
+				root_0 = (object)adaptor.BecomeRoot(STRING109_tree, root_0);
 
 				}
 				break;
 			case 4:
 				DebugEnterAlt(4);
-				// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:108:37: DATETIME ^
+				// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:132:37: DATETIME ^
 				{
-				DebugLocation(108, 45);
-				DATETIME81=(IToken)Match(input,DATETIME,Follow._DATETIME_in_constant822); 
-				DATETIME81_tree = (object)adaptor.Create(DATETIME81);
-				root_0 = (object)adaptor.BecomeRoot(DATETIME81_tree, root_0);
+				DebugLocation(132, 45);
+				DATETIME110=(IToken)Match(input,DATETIME,Follow._DATETIME_in_constant975); 
+				DATETIME110_tree = (object)adaptor.Create(DATETIME110);
+				root_0 = (object)adaptor.BecomeRoot(DATETIME110_tree, root_0);
 
 				}
 				break;
 			case 5:
 				DebugEnterAlt(5);
-				// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:108:49: LONG ^
+				// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:132:49: LONG ^
 				{
-				DebugLocation(108, 53);
-				LONG82=(IToken)Match(input,LONG,Follow._LONG_in_constant827); 
-				LONG82_tree = (object)adaptor.Create(LONG82);
-				root_0 = (object)adaptor.BecomeRoot(LONG82_tree, root_0);
+				DebugLocation(132, 53);
+				LONG111=(IToken)Match(input,LONG,Follow._LONG_in_constant980); 
+				LONG111_tree = (object)adaptor.Create(LONG111);
+				root_0 = (object)adaptor.BecomeRoot(LONG111_tree, root_0);
 
 				}
 				break;
 			case 6:
 				DebugEnterAlt(6);
-				// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:108:57: SINGLE ^
+				// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:132:57: SINGLE ^
 				{
-				DebugLocation(108, 63);
-				SINGLE83=(IToken)Match(input,SINGLE,Follow._SINGLE_in_constant832); 
-				SINGLE83_tree = (object)adaptor.Create(SINGLE83);
-				root_0 = (object)adaptor.BecomeRoot(SINGLE83_tree, root_0);
+				DebugLocation(132, 63);
+				SINGLE112=(IToken)Match(input,SINGLE,Follow._SINGLE_in_constant985); 
+				SINGLE112_tree = (object)adaptor.Create(SINGLE112);
+				root_0 = (object)adaptor.BecomeRoot(SINGLE112_tree, root_0);
 
 				}
 				break;
 			case 7:
 				DebugEnterAlt(7);
-				// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:108:67: DECIMAL ^
+				// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:132:67: DECIMAL ^
 				{
-				DebugLocation(108, 74);
-				DECIMAL84=(IToken)Match(input,DECIMAL,Follow._DECIMAL_in_constant837); 
-				DECIMAL84_tree = (object)adaptor.Create(DECIMAL84);
-				root_0 = (object)adaptor.BecomeRoot(DECIMAL84_tree, root_0);
+				DebugLocation(132, 74);
+				DECIMAL113=(IToken)Match(input,DECIMAL,Follow._DECIMAL_in_constant990); 
+				DECIMAL113_tree = (object)adaptor.Create(DECIMAL113);
+				root_0 = (object)adaptor.BecomeRoot(DECIMAL113_tree, root_0);
 
 				}
 				break;
 			case 8:
 				DebugEnterAlt(8);
-				// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:108:78: DOUBLE ^
+				// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:132:78: DOUBLE ^
 				{
-				DebugLocation(108, 84);
-				DOUBLE85=(IToken)Match(input,DOUBLE,Follow._DOUBLE_in_constant842); 
-				DOUBLE85_tree = (object)adaptor.Create(DOUBLE85);
-				root_0 = (object)adaptor.BecomeRoot(DOUBLE85_tree, root_0);
+				DebugLocation(132, 84);
+				DOUBLE114=(IToken)Match(input,DOUBLE,Follow._DOUBLE_in_constant995); 
+				DOUBLE114_tree = (object)adaptor.Create(DOUBLE114);
+				root_0 = (object)adaptor.BecomeRoot(DOUBLE114_tree, root_0);
 
 				}
 				break;
 			case 9:
 				DebugEnterAlt(9);
-				// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:108:88: GUID ^
+				// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:132:88: GUID ^
 				{
-				DebugLocation(108, 92);
-				GUID86=(IToken)Match(input,GUID,Follow._GUID_in_constant847); 
-				GUID86_tree = (object)adaptor.Create(GUID86);
-				root_0 = (object)adaptor.BecomeRoot(GUID86_tree, root_0);
+				DebugLocation(132, 92);
+				GUID115=(IToken)Match(input,GUID,Follow._GUID_in_constant1000); 
+				GUID115_tree = (object)adaptor.Create(GUID115);
+				root_0 = (object)adaptor.BecomeRoot(GUID115_tree, root_0);
 
 				}
 				break;
 			case 10:
 				DebugEnterAlt(10);
-				// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:108:96: BYTE ^
+				// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:132:96: BYTE ^
 				{
-				DebugLocation(108, 100);
-				BYTE87=(IToken)Match(input,BYTE,Follow._BYTE_in_constant852); 
-				BYTE87_tree = (object)adaptor.Create(BYTE87);
-				root_0 = (object)adaptor.BecomeRoot(BYTE87_tree, root_0);
+				DebugLocation(132, 100);
+				BYTE116=(IToken)Match(input,BYTE,Follow._BYTE_in_constant1005); 
+				BYTE116_tree = (object)adaptor.Create(BYTE116);
+				root_0 = (object)adaptor.BecomeRoot(BYTE116_tree, root_0);
 
 				}
 				break;
 			case 11:
 				DebugEnterAlt(11);
-				// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:108:104: NULL ^
+				// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:132:104: NULL ^
 				{
-				DebugLocation(108, 108);
-				NULL88=(IToken)Match(input,NULL,Follow._NULL_in_constant857); 
-				NULL88_tree = (object)adaptor.Create(NULL88);
-				root_0 = (object)adaptor.BecomeRoot(NULL88_tree, root_0);
+				DebugLocation(132, 108);
+				NULL117=(IToken)Match(input,NULL,Follow._NULL_in_constant1010); 
+				NULL117_tree = (object)adaptor.Create(NULL117);
+				root_0 = (object)adaptor.BecomeRoot(NULL117_tree, root_0);
 
 				}
 				break;
 
 			}
-			} finally { DebugExitSubRule(24); }
+			} finally { DebugExitSubRule(28); }
 
 
 			}
@@ -3559,11 +4320,11 @@ private AstParserRuleReturnScope<object, IToken> constant()
 		}
 		finally
 		{
-			TraceOut("constant", 21);
-			LeaveRule("constant", 21);
+			TraceOut("constant", 29);
+			LeaveRule("constant", 29);
 			LeaveRule_constant();
 		}
-		DebugLocation(108, 109);
+		DebugLocation(132, 109);
 		} finally { DebugExitRule(GrammarFileName, "constant"); }
 		return retval;
 
@@ -3573,45 +4334,45 @@ private AstParserRuleReturnScope<object, IToken> constant()
 	partial void EnterRule_propertyname();
 	partial void LeaveRule_propertyname();
 	// $ANTLR start "propertyname"
-	// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:110:1: propertyname[bool subquery] : ( identifierpart[subquery] -> identifierpart ) ( '/' next= subpropertyname[false] -> ^( $propertyname $next) )? ;
+	// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:134:1: propertyname[bool subquery] : ( identifierpart[subquery] -> identifierpart ) ( '/' next= subpropertyname[false] -> ^( $propertyname $next) )? ;
 	[GrammarRule("propertyname")]
 	private AstParserRuleReturnScope<object, IToken> propertyname(bool subquery)
 	{
 		EnterRule_propertyname();
-		EnterRule("propertyname", 22);
-		TraceIn("propertyname", 22);
+		EnterRule("propertyname", 30);
+		TraceIn("propertyname", 30);
 		AstParserRuleReturnScope<object, IToken> retval = new AstParserRuleReturnScope<object, IToken>();
 		retval.Start = (IToken)input.LT(1);
 
 		object root_0 = default(object);
 
-		IToken char_literal90 = default(IToken);
+		IToken char_literal119 = default(IToken);
 		AstParserRuleReturnScope<object, IToken> next = default(AstParserRuleReturnScope<object, IToken>);
-		AstParserRuleReturnScope<object, IToken> identifierpart89 = default(AstParserRuleReturnScope<object, IToken>);
+		AstParserRuleReturnScope<object, IToken> identifierpart118 = default(AstParserRuleReturnScope<object, IToken>);
 
-		object char_literal90_tree = default(object);
-		RewriteRuleITokenStream stream_74=new RewriteRuleITokenStream(adaptor,"token 74");
+		object char_literal119_tree = default(object);
+		RewriteRuleITokenStream stream_78=new RewriteRuleITokenStream(adaptor,"token 78");
 		RewriteRuleSubtreeStream stream_identifierpart=new RewriteRuleSubtreeStream(adaptor,"rule identifierpart");
 		RewriteRuleSubtreeStream stream_subpropertyname=new RewriteRuleSubtreeStream(adaptor,"rule subpropertyname");
 		try { DebugEnterRule(GrammarFileName, "propertyname");
-		DebugLocation(110, 108);
+		DebugLocation(134, 108);
 		try
 		{
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:111:2: ( ( identifierpart[subquery] -> identifierpart ) ( '/' next= subpropertyname[false] -> ^( $propertyname $next) )? )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:135:2: ( ( identifierpart[subquery] -> identifierpart ) ( '/' next= subpropertyname[false] -> ^( $propertyname $next) )? )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:111:4: ( identifierpart[subquery] -> identifierpart ) ( '/' next= subpropertyname[false] -> ^( $propertyname $next) )?
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:135:4: ( identifierpart[subquery] -> identifierpart ) ( '/' next= subpropertyname[false] -> ^( $propertyname $next) )?
 			{
-			DebugLocation(111, 4);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:111:4: ( identifierpart[subquery] -> identifierpart )
+			DebugLocation(135, 4);
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:135:4: ( identifierpart[subquery] -> identifierpart )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:111:5: identifierpart[subquery]
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:135:5: identifierpart[subquery]
 			{
-			DebugLocation(111, 5);
-			PushFollow(Follow._identifierpart_in_propertyname870);
-			identifierpart89=identifierpart(subquery);
+			DebugLocation(135, 5);
+			PushFollow(Follow._identifierpart_in_propertyname1023);
+			identifierpart118=identifierpart(subquery);
 			PopFollow();
 
-			stream_identifierpart.Add(identifierpart89.Tree);
+			stream_identifierpart.Add(identifierpart118.Tree);
 
 
 			{
@@ -3626,9 +4387,9 @@ private AstParserRuleReturnScope<object, IToken> propertyname(bool subquery)
 			RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.Tree:null);
 
 			root_0 = (object)adaptor.Nil();
-			// 111:30: -> identifierpart
+			// 135:30: -> identifierpart
 			{
-				DebugLocation(111, 33);
+				DebugLocation(135, 33);
 				adaptor.AddChild(root_0, stream_identifierpart.NextTree());
 
 			}
@@ -3638,35 +4399,35 @@ private AstParserRuleReturnScope<object, IToken> propertyname(bool subquery)
 
 			}
 
-			DebugLocation(111, 49);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:111:49: ( '/' next= subpropertyname[false] -> ^( $propertyname $next) )?
-			int alt25=2;
-			try { DebugEnterSubRule(25);
-			try { DebugEnterDecision(25, false);
-			int LA25_1 = input.LA(1);
+			DebugLocation(135, 49);
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:135:49: ( '/' next= subpropertyname[false] -> ^( $propertyname $next) )?
+			int alt29=2;
+			try { DebugEnterSubRule(29);
+			try { DebugEnterDecision(29, false);
+			int LA29_1 = input.LA(1);
 
-			if ((LA25_1==74))
+			if ((LA29_1==78))
 			{
-				int LA25_2 = input.LA(2);
+				int LA29_2 = input.LA(2);
 
-				if ((LA25_2==DYNAMICIDENTIFIER||LA25_2==IDENTIFIER))
+				if ((LA29_2==DYNAMICIDENTIFIER||LA29_2==IDENTIFIER))
 				{
-					alt25 = 1;
+					alt29 = 1;
 				}
 			}
-			} finally { DebugExitDecision(25); }
-			switch (alt25)
+			} finally { DebugExitDecision(29); }
+			switch (alt29)
 			{
 			case 1:
 				DebugEnterAlt(1);
-				// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:111:50: '/' next= subpropertyname[false]
+				// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:135:50: '/' next= subpropertyname[false]
 				{
-				DebugLocation(111, 50);
-				char_literal90=(IToken)Match(input,74,Follow._74_in_propertyname879);  
-				stream_74.Add(char_literal90);
+				DebugLocation(135, 50);
+				char_literal119=(IToken)Match(input,78,Follow._78_in_propertyname1032);  
+				stream_78.Add(char_literal119);
 
-				DebugLocation(111, 58);
-				PushFollow(Follow._subpropertyname_in_propertyname883);
+				DebugLocation(135, 58);
+				PushFollow(Follow._subpropertyname_in_propertyname1036);
 				next=subpropertyname(false);
 				PopFollow();
 
@@ -3686,16 +4447,16 @@ private AstParserRuleReturnScope<object, IToken> propertyname(bool subquery)
 				RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.Tree:null);
 
 				root_0 = (object)adaptor.Nil();
-				// 111:82: -> ^( $propertyname $next)
+				// 135:82: -> ^( $propertyname $next)
 				{
-					DebugLocation(111, 85);
-					// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:111:85: ^( $propertyname $next)
+					DebugLocation(135, 85);
+					// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:135:85: ^( $propertyname $next)
 					{
 					object root_1 = (object)adaptor.Nil();
-					DebugLocation(111, 88);
+					DebugLocation(135, 88);
 					root_1 = (object)adaptor.BecomeRoot(stream_retval.NextNode(), root_1);
 
-					DebugLocation(111, 102);
+					DebugLocation(135, 102);
 					adaptor.AddChild(root_1, stream_next.NextTree());
 
 					adaptor.AddChild(root_0, root_1);
@@ -3710,7 +4471,7 @@ private AstParserRuleReturnScope<object, IToken> propertyname(bool subquery)
 				break;
 
 			}
-			} finally { DebugExitSubRule(25); }
+			} finally { DebugExitSubRule(29); }
 
 
 			}
@@ -3730,11 +4491,11 @@ private AstParserRuleReturnScope<object, IToken> propertyname(bool subquery)
 		}
 		finally
 		{
-			TraceOut("propertyname", 22);
-			LeaveRule("propertyname", 22);
+			TraceOut("propertyname", 30);
+			LeaveRule("propertyname", 30);
 			LeaveRule_propertyname();
 		}
-		DebugLocation(111, 108);
+		DebugLocation(135, 108);
 		} finally { DebugExitRule(GrammarFileName, "propertyname"); }
 		return retval;
 
@@ -3744,36 +4505,36 @@ private AstParserRuleReturnScope<object, IToken> propertyname(bool subquery)
 	partial void EnterRule_subpropertyname();
 	partial void LeaveRule_subpropertyname();
 	// $ANTLR start "subpropertyname"
-	// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:113:1: subpropertyname[bool subquery] : propertyname[false] ;
+	// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:137:1: subpropertyname[bool subquery] : propertyname[false] ;
 	[GrammarRule("subpropertyname")]
 	private AstParserRuleReturnScope<object, IToken> subpropertyname(bool subquery)
 	{
 		EnterRule_subpropertyname();
-		EnterRule("subpropertyname", 23);
-		TraceIn("subpropertyname", 23);
+		EnterRule("subpropertyname", 31);
+		TraceIn("subpropertyname", 31);
 		AstParserRuleReturnScope<object, IToken> retval = new AstParserRuleReturnScope<object, IToken>();
 		retval.Start = (IToken)input.LT(1);
 
 		object root_0 = default(object);
 
-		AstParserRuleReturnScope<object, IToken> propertyname91 = default(AstParserRuleReturnScope<object, IToken>);
+		AstParserRuleReturnScope<object, IToken> propertyname120 = default(AstParserRuleReturnScope<object, IToken>);
 
 		try { DebugEnterRule(GrammarFileName, "subpropertyname");
-		DebugLocation(113, 22);
+		DebugLocation(137, 22);
 		try
 		{
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:114:2: ( propertyname[false] )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:138:2: ( propertyname[false] )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:114:4: propertyname[false]
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:138:4: propertyname[false]
 			{
 			root_0 = (object)adaptor.Nil();
 
-			DebugLocation(114, 4);
-			PushFollow(Follow._propertyname_in_subpropertyname906);
-			propertyname91=propertyname(false);
+			DebugLocation(138, 4);
+			PushFollow(Follow._propertyname_in_subpropertyname1059);
+			propertyname120=propertyname(false);
 			PopFollow();
 
-			adaptor.AddChild(root_0, propertyname91.Tree);
+			adaptor.AddChild(root_0, propertyname120.Tree);
 
 			}
 
@@ -3792,11 +4553,11 @@ private AstParserRuleReturnScope<object, IToken> subpropertyname(bool subquery)
 		}
 		finally
 		{
-			TraceOut("subpropertyname", 23);
-			LeaveRule("subpropertyname", 23);
+			TraceOut("subpropertyname", 31);
+			LeaveRule("subpropertyname", 31);
 			LeaveRule_subpropertyname();
 		}
-		DebugLocation(114, 22);
+		DebugLocation(138, 22);
 		} finally { DebugExitRule(GrammarFileName, "subpropertyname"); }
 		return retval;
 
@@ -3806,63 +4567,63 @@ private AstParserRuleReturnScope<object, IToken> subpropertyname(bool subquery)
 	partial void EnterRule_identifierpart();
 	partial void LeaveRule_identifierpart();
 	// $ANTLR start "identifierpart"
-	// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:116:1: identifierpart[bool subquery] : (id= IDENTIFIER -> {subquery}? ALIAS[$id] -> IDENTIFIER[$id] | DYNAMICIDENTIFIER -> DYNAMICIDENTIFIER ) ;
+	// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:140:1: identifierpart[bool subquery] : (id= IDENTIFIER -> {subquery}? ALIAS[$id] -> IDENTIFIER[$id] | DYNAMICIDENTIFIER -> DYNAMICIDENTIFIER ) ;
 	[GrammarRule("identifierpart")]
 	private AstParserRuleReturnScope<object, IToken> identifierpart(bool subquery)
 	{
 		EnterRule_identifierpart();
-		EnterRule("identifierpart", 24);
-		TraceIn("identifierpart", 24);
+		EnterRule("identifierpart", 32);
+		TraceIn("identifierpart", 32);
 		AstParserRuleReturnScope<object, IToken> retval = new AstParserRuleReturnScope<object, IToken>();
 		retval.Start = (IToken)input.LT(1);
 
 		object root_0 = default(object);
 
 		IToken id = default(IToken);
-		IToken DYNAMICIDENTIFIER92 = default(IToken);
+		IToken DYNAMICIDENTIFIER121 = default(IToken);
 
 		object id_tree = default(object);
-		object DYNAMICIDENTIFIER92_tree = default(object);
+		object DYNAMICIDENTIFIER121_tree = default(object);
 		RewriteRuleITokenStream stream_IDENTIFIER=new RewriteRuleITokenStream(adaptor,"token IDENTIFIER");
 		RewriteRuleITokenStream stream_DYNAMICIDENTIFIER=new RewriteRuleITokenStream(adaptor,"token DYNAMICIDENTIFIER");
 		try { DebugEnterRule(GrammarFileName, "identifierpart");
-		DebugLocation(116, 43);
+		DebugLocation(140, 43);
 		try
 		{
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:117:2: ( (id= IDENTIFIER -> {subquery}? ALIAS[$id] -> IDENTIFIER[$id] | DYNAMICIDENTIFIER -> DYNAMICIDENTIFIER ) )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:141:2: ( (id= IDENTIFIER -> {subquery}? ALIAS[$id] -> IDENTIFIER[$id] | DYNAMICIDENTIFIER -> DYNAMICIDENTIFIER ) )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:117:4: (id= IDENTIFIER -> {subquery}? ALIAS[$id] -> IDENTIFIER[$id] | DYNAMICIDENTIFIER -> DYNAMICIDENTIFIER )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:141:4: (id= IDENTIFIER -> {subquery}? ALIAS[$id] -> IDENTIFIER[$id] | DYNAMICIDENTIFIER -> DYNAMICIDENTIFIER )
 			{
-			DebugLocation(117, 4);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:117:4: (id= IDENTIFIER -> {subquery}? ALIAS[$id] -> IDENTIFIER[$id] | DYNAMICIDENTIFIER -> DYNAMICIDENTIFIER )
-			int alt26=2;
-			try { DebugEnterSubRule(26);
-			try { DebugEnterDecision(26, false);
-			int LA26_1 = input.LA(1);
-
-			if ((LA26_1==IDENTIFIER))
+			DebugLocation(141, 4);
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:141:4: (id= IDENTIFIER -> {subquery}? ALIAS[$id] -> IDENTIFIER[$id] | DYNAMICIDENTIFIER -> DYNAMICIDENTIFIER )
+			int alt30=2;
+			try { DebugEnterSubRule(30);
+			try { DebugEnterDecision(30, false);
+			int LA30_1 = input.LA(1);
+
+			if ((LA30_1==IDENTIFIER))
 			{
-				alt26 = 1;
+				alt30 = 1;
 			}
-			else if ((LA26_1==DYNAMICIDENTIFIER))
+			else if ((LA30_1==DYNAMICIDENTIFIER))
 			{
-				alt26 = 2;
+				alt30 = 2;
 			}
 			else
 			{
-				NoViableAltException nvae = new NoViableAltException("", 26, 0, input, 1);
+				NoViableAltException nvae = new NoViableAltException("", 30, 0, input, 1);
 				DebugRecognitionException(nvae);
 				throw nvae;
 			}
-			} finally { DebugExitDecision(26); }
-			switch (alt26)
+			} finally { DebugExitDecision(30); }
+			switch (alt30)
 			{
 			case 1:
 				DebugEnterAlt(1);
-				// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:117:5: id= IDENTIFIER
+				// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:141:5: id= IDENTIFIER
 				{
-				DebugLocation(117, 7);
-				id=(IToken)Match(input,IDENTIFIER,Follow._IDENTIFIER_in_identifierpart921);  
+				DebugLocation(141, 7);
+				id=(IToken)Match(input,IDENTIFIER,Follow._IDENTIFIER_in_identifierpart1074);  
 				stream_IDENTIFIER.Add(id);
 
 
@@ -3879,16 +4640,16 @@ private AstParserRuleReturnScope<object, IToken> identifierpart(bool subquery)
 				RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.Tree:null);
 
 				root_0 = (object)adaptor.Nil();
-				// 117:19: -> {subquery}? ALIAS[$id]
+				// 141:19: -> {subquery}? ALIAS[$id]
 				if (subquery)
 				{
-					DebugLocation(117, 34);
+					DebugLocation(141, 34);
 					adaptor.AddChild(root_0, (object)adaptor.Create(ALIAS, id));
 
 				}
-				else // 118:5: -> IDENTIFIER[$id]
+				else // 142:5: -> IDENTIFIER[$id]
 				{
-					DebugLocation(118, 8);
+					DebugLocation(142, 8);
 					adaptor.AddChild(root_0, (object)adaptor.Create(IDENTIFIER, id));
 
 				}
@@ -3900,11 +4661,11 @@ private AstParserRuleReturnScope<object, IToken> identifierpart(bool subquery)
 				break;
 			case 2:
 				DebugEnterAlt(2);
-				// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:119:5: DYNAMICIDENTIFIER
+				// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:143:5: DYNAMICIDENTIFIER
 				{
-				DebugLocation(119, 5);
-				DYNAMICIDENTIFIER92=(IToken)Match(input,DYNAMICIDENTIFIER,Follow._DYNAMICIDENTIFIER_in_identifierpart943);  
-				stream_DYNAMICIDENTIFIER.Add(DYNAMICIDENTIFIER92);
+				DebugLocation(143, 5);
+				DYNAMICIDENTIFIER121=(IToken)Match(input,DYNAMICIDENTIFIER,Follow._DYNAMICIDENTIFIER_in_identifierpart1096);  
+				stream_DYNAMICIDENTIFIER.Add(DYNAMICIDENTIFIER121);
 
 
 
@@ -3920,9 +4681,9 @@ private AstParserRuleReturnScope<object, IToken> identifierpart(bool subquery)
 				RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.Tree:null);
 
 				root_0 = (object)adaptor.Nil();
-				// 119:23: -> DYNAMICIDENTIFIER
+				// 143:23: -> DYNAMICIDENTIFIER
 				{
-					DebugLocation(119, 26);
+					DebugLocation(143, 26);
 					adaptor.AddChild(root_0, stream_DYNAMICIDENTIFIER.NextNode());
 
 				}
@@ -3934,7 +4695,7 @@ private AstParserRuleReturnScope<object, IToken> identifierpart(bool subquery)
 				break;
 
 			}
-			} finally { DebugExitSubRule(26); }
+			} finally { DebugExitSubRule(30); }
 
 
 			}
@@ -3954,11 +4715,11 @@ private AstParserRuleReturnScope<object, IToken> identifierpart(bool subquery)
 		}
 		finally
 		{
-			TraceOut("identifierpart", 24);
-			LeaveRule("identifierpart", 24);
+			TraceOut("identifierpart", 32);
+			LeaveRule("identifierpart", 32);
 			LeaveRule_identifierpart();
 		}
-		DebugLocation(119, 43);
+		DebugLocation(143, 43);
 		} finally { DebugExitRule(GrammarFileName, "identifierpart"); }
 		return retval;
 
@@ -3968,38 +4729,38 @@ private AstParserRuleReturnScope<object, IToken> identifierpart(bool subquery)
 	partial void EnterRule_filteroperator();
 	partial void LeaveRule_filteroperator();
 	// $ANTLR start "filteroperator"
-	// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:121:1: filteroperator : ( EQUALS | NOTEQUALS | GREATERTHAN | GREATERTHANOREQUAL | LESSTHAN | LESSTHANOREQUAL );
+	// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:145:1: filteroperator : ( EQUALS | NOTEQUALS | GREATERTHAN | GREATERTHANOREQUAL | LESSTHAN | LESSTHANOREQUAL );
 	[GrammarRule("filteroperator")]
 	private AstParserRuleReturnScope<object, IToken> filteroperator()
 	{
 		EnterRule_filteroperator();
-		EnterRule("filteroperator", 25);
-		TraceIn("filteroperator", 25);
+		EnterRule("filteroperator", 33);
+		TraceIn("filteroperator", 33);
 		AstParserRuleReturnScope<object, IToken> retval = new AstParserRuleReturnScope<object, IToken>();
 		retval.Start = (IToken)input.LT(1);
 
 		object root_0 = default(object);
 
-		IToken set93 = default(IToken);
+		IToken set122 = default(IToken);
 
-		object set93_tree = default(object);
+		object set122_tree = default(object);
 		try { DebugEnterRule(GrammarFileName, "filteroperator");
-		DebugLocation(121, 85);
+		DebugLocation(145, 85);
 		try
 		{
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:122:2: ( EQUALS | NOTEQUALS | GREATERTHAN | GREATERTHANOREQUAL | LESSTHAN | LESSTHANOREQUAL )
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:146:2: ( EQUALS | NOTEQUALS | GREATERTHAN | GREATERTHANOREQUAL | LESSTHAN | LESSTHANOREQUAL )
 			DebugEnterAlt(1);
-			// C:\\projects\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:
+			// C:\\git\\other\\LinqToQuerystring\\LinqToQuerystring\\LinqToQuerystring.g:
 			{
 			root_0 = (object)adaptor.Nil();
 
-			DebugLocation(122, 2);
+			DebugLocation(146, 2);
 
-			set93=(IToken)input.LT(1);
+			set122=(IToken)input.LT(1);
 			if (input.LA(1)==EQUALS||(input.LA(1)>=GREATERTHAN && input.LA(1)<=GREATERTHANOREQUAL)||(input.LA(1)>=LESSTHAN && input.LA(1)<=LESSTHANOREQUAL)||input.LA(1)==NOTEQUALS)
 			{
 				input.Consume();
-				adaptor.AddChild(root_0, (object)adaptor.Create(set93));
+				adaptor.AddChild(root_0, (object)adaptor.Create(set122));
 				state.errorRecovery=false;
 			}
 			else
@@ -4027,11 +4788,11 @@ private AstParserRuleReturnScope<object, IToken> filteroperator()
 		}
 		finally
 		{
-			TraceOut("filteroperator", 25);
-			LeaveRule("filteroperator", 25);
+			TraceOut("filteroperator", 33);
+			LeaveRule("filteroperator", 33);
 			LeaveRule_filteroperator();
 		}
-		DebugLocation(122, 85);
+		DebugLocation(146, 85);
 		} finally { DebugExitRule(GrammarFileName, "filteroperator"); }
 		return retval;
 
@@ -4043,9 +4804,9 @@ private AstParserRuleReturnScope<object, IToken> filteroperator()
 	#region Follow sets
 	private static class Follow
 	{
-		public static readonly BitSet _param_in_prog76 = new BitSet(new ulong[]{0x520001806000002UL,0x42UL});
-		public static readonly BitSet _70_in_prog79 = new BitSet(new ulong[]{0x520001806000000UL,0x2UL});
-		public static readonly BitSet _param_in_prog82 = new BitSet(new ulong[]{0x520001806000002UL,0x42UL});
+		public static readonly BitSet _param_in_prog76 = new BitSet(new ulong[]{0x290000C030000402UL,0x410UL});
+		public static readonly BitSet _74_in_prog79 = new BitSet(new ulong[]{0x290000C030000400UL,0x10UL});
+		public static readonly BitSet _param_in_prog82 = new BitSet(new ulong[]{0x290000C030000402UL,0x410UL});
 		public static readonly BitSet _orderby_in_param95 = new BitSet(new ulong[]{0x2UL});
 		public static readonly BitSet _top_in_param99 = new BitSet(new ulong[]{0x2UL});
 		public static readonly BitSet _skip_in_param103 = new BitSet(new ulong[]{0x2UL});
@@ -4054,106 +4815,134 @@ private static class Follow
 		public static readonly BitSet _inlinecount_in_param115 = new BitSet(new ulong[]{0x2UL});
 		public static readonly BitSet _expand_in_param119 = new BitSet(new ulong[]{0x2UL});
 		public static readonly BitSet _ignored_in_param123 = new BitSet(new ulong[]{0x2UL});
-		public static readonly BitSet _SKIP_in_skip134 = new BitSet(new ulong[]{0x2000000000UL});
-		public static readonly BitSet _INT_in_skip137 = new BitSet(new ulong[]{0x2000000002UL});
-		public static readonly BitSet _TOP_in_top148 = new BitSet(new ulong[]{0x2000000000UL});
-		public static readonly BitSet _INT_in_top151 = new BitSet(new ulong[]{0x2000000002UL});
-		public static readonly BitSet _FILTER_in_filter162 = new BitSet(new ulong[]{0x72C539272077B000UL,0xB5UL});
-		public static readonly BitSet _filterexpression_in_filter165 = new BitSet(new ulong[]{0x2UL});
-		public static readonly BitSet _SELECT_in_select176 = new BitSet(new ulong[]{0x400200000UL});
-		public static readonly BitSet _propertyname_in_select179 = new BitSet(new ulong[]{0x2UL,0x200UL});
-		public static readonly BitSet _73_in_select183 = new BitSet(new ulong[]{0x400200000UL});
-		public static readonly BitSet _propertyname_in_select186 = new BitSet(new ulong[]{0x2UL,0x200UL});
-		public static readonly BitSet _EXPAND_in_expand201 = new BitSet(new ulong[]{0x400200000UL});
-		public static readonly BitSet _propertyname_in_expand204 = new BitSet(new ulong[]{0x2UL,0x200UL});
-		public static readonly BitSet _73_in_expand208 = new BitSet(new ulong[]{0x400200000UL});
-		public static readonly BitSet _propertyname_in_expand211 = new BitSet(new ulong[]{0x2UL,0x200UL});
-		public static readonly BitSet _INLINECOUNT_in_inlinecount223 = new BitSet(new ulong[]{0x40UL});
-		public static readonly BitSet _ALLPAGES_in_inlinecount226 = new BitSet(new ulong[]{0x2UL});
-		public static readonly BitSet _INLINECOUNT_in_inlinecount231 = new BitSet(new ulong[]{0x800000000000UL});
-		public static readonly BitSet _NONE_in_inlinecount233 = new BitSet(new ulong[]{0x2UL});
-		public static readonly BitSet _IGNORED_in_ignored243 = new BitSet(new ulong[]{0x400000000UL});
-		public static readonly BitSet _IDENTIFIER_in_ignored245 = new BitSet(new ulong[]{0x2UL});
-		public static readonly BitSet _orexpression_in_filterexpression259 = new BitSet(new ulong[]{0x800000000000002UL});
-		public static readonly BitSet _SPACE_in_filterexpression263 = new BitSet(new ulong[]{0x10000000000000UL});
-		public static readonly BitSet _OR_in_filterexpression266 = new BitSet(new ulong[]{0x800000000000000UL});
-		public static readonly BitSet _SPACE_in_filterexpression269 = new BitSet(new ulong[]{0x72C539272077B000UL,0xB5UL});
-		public static readonly BitSet _orexpression_in_filterexpression272 = new BitSet(new ulong[]{0x800000000000002UL});
-		public static readonly BitSet _andexpression_in_orexpression286 = new BitSet(new ulong[]{0x800000000000002UL});
-		public static readonly BitSet _SPACE_in_orexpression290 = new BitSet(new ulong[]{0x80UL});
-		public static readonly BitSet _AND_in_orexpression293 = new BitSet(new ulong[]{0x800000000000000UL});
-		public static readonly BitSet _SPACE_in_orexpression296 = new BitSet(new ulong[]{0x72C539272077B000UL,0xB5UL});
-		public static readonly BitSet _andexpression_in_orexpression299 = new BitSet(new ulong[]{0x800000000000002UL});
-		public static readonly BitSet _NOT_in_andexpression313 = new BitSet(new ulong[]{0x800000000000000UL});
-		public static readonly BitSet _SPACE_in_andexpression316 = new BitSet(new ulong[]{0x72C439272077B000UL,0xB5UL});
-		public static readonly BitSet _71_in_andexpression319 = new BitSet(new ulong[]{0x72C539272077B000UL,0xB5UL});
-		public static readonly BitSet _filterexpression_in_andexpression321 = new BitSet(new ulong[]{0x0UL,0x100UL});
-		public static readonly BitSet _72_in_andexpression324 = new BitSet(new ulong[]{0x2UL});
-		public static readonly BitSet _booleanexpression_in_andexpression328 = new BitSet(new ulong[]{0x2UL});
-		public static readonly BitSet _71_in_andexpression336 = new BitSet(new ulong[]{0x72C539272077B000UL,0xB5UL});
-		public static readonly BitSet _filterexpression_in_andexpression338 = new BitSet(new ulong[]{0x0UL,0x100UL});
-		public static readonly BitSet _72_in_andexpression341 = new BitSet(new ulong[]{0x2UL});
-		public static readonly BitSet _booleanexpression_in_andexpression345 = new BitSet(new ulong[]{0x2UL});
-		public static readonly BitSet _atom_in_booleanexpression361 = new BitSet(new ulong[]{0x800000000000002UL});
-		public static readonly BitSet _SPACE_in_booleanexpression369 = new BitSet(new ulong[]{0x200C018800000UL});
-		public static readonly BitSet _EQUALS_in_booleanexpression374 = new BitSet(new ulong[]{0x800000000000000UL});
-		public static readonly BitSet _NOTEQUALS_in_booleanexpression380 = new BitSet(new ulong[]{0x800000000000000UL});
-		public static readonly BitSet _GREATERTHAN_in_booleanexpression386 = new BitSet(new ulong[]{0x800000000000000UL});
-		public static readonly BitSet _GREATERTHANOREQUAL_in_booleanexpression392 = new BitSet(new ulong[]{0x800000000000000UL});
-		public static readonly BitSet _LESSTHAN_in_booleanexpression398 = new BitSet(new ulong[]{0x800000000000000UL});
-		public static readonly BitSet _LESSTHANOREQUAL_in_booleanexpression404 = new BitSet(new ulong[]{0x800000000000000UL});
-		public static readonly BitSet _SPACE_in_booleanexpression407 = new BitSet(new ulong[]{0x72C439272077B000UL,0x35UL});
-		public static readonly BitSet _atom_in_booleanexpression411 = new BitSet(new ulong[]{0x2UL});
-		public static readonly BitSet _functioncall_in_atom463 = new BitSet(new ulong[]{0x2UL});
-		public static readonly BitSet _constant_in_atom469 = new BitSet(new ulong[]{0x2UL});
-		public static readonly BitSet _accessor_in_atom474 = new BitSet(new ulong[]{0x2UL});
-		public static readonly BitSet _function_in_functioncall486 = new BitSet(new ulong[]{0x0UL,0x80UL});
-		public static readonly BitSet _71_in_functioncall489 = new BitSet(new ulong[]{0x72C439272077B000UL,0x35UL});
-		public static readonly BitSet _atom_in_functioncall491 = new BitSet(new ulong[]{0x0UL,0x300UL});
-		public static readonly BitSet _73_in_functioncall495 = new BitSet(new ulong[]{0x72C439272077B000UL,0x35UL});
-		public static readonly BitSet _atom_in_functioncall497 = new BitSet(new ulong[]{0x0UL,0x300UL});
-		public static readonly BitSet _72_in_functioncall502 = new BitSet(new ulong[]{0x2UL});
-		public static readonly BitSet _propertyname_in_accessor514 = new BitSet(new ulong[]{0x2UL,0x400UL});
-		public static readonly BitSet _74_in_accessor527 = new BitSet(new ulong[]{0x8000060000004920UL});
-		public static readonly BitSet _ANY_in_accessor532 = new BitSet(new ulong[]{0x0UL,0x80UL});
-		public static readonly BitSet _ALL_in_accessor538 = new BitSet(new ulong[]{0x0UL,0x80UL});
-		public static readonly BitSet _COUNT_in_accessor544 = new BitSet(new ulong[]{0x0UL,0x80UL});
-		public static readonly BitSet _MAX_in_accessor550 = new BitSet(new ulong[]{0x0UL,0x80UL});
-		public static readonly BitSet _MIN_in_accessor556 = new BitSet(new ulong[]{0x0UL,0x80UL});
-		public static readonly BitSet _SUM_in_accessor562 = new BitSet(new ulong[]{0x0UL,0x80UL});
-		public static readonly BitSet _AVERAGE_in_accessor568 = new BitSet(new ulong[]{0x0UL,0x80UL});
-		public static readonly BitSet _71_in_accessor575 = new BitSet(new ulong[]{0x400000000UL,0x100UL});
-		public static readonly BitSet _IDENTIFIER_in_accessor586 = new BitSet(new ulong[]{0x0UL,0x800UL});
-		public static readonly BitSet _75_in_accessor588 = new BitSet(new ulong[]{0x800000000000000UL});
-		public static readonly BitSet _SPACE_in_accessor590 = new BitSet(new ulong[]{0x72C539272077B000UL,0xB5UL});
-		public static readonly BitSet _filterexpression_in_accessor592 = new BitSet(new ulong[]{0x0UL,0x100UL});
-		public static readonly BitSet _72_in_accessor632 = new BitSet(new ulong[]{0x2UL});
-		public static readonly BitSet _ORDERBY_in_orderby719 = new BitSet(new ulong[]{0x400200000UL});
-		public static readonly BitSet _orderbylist_in_orderby722 = new BitSet(new ulong[]{0x2UL});
-		public static readonly BitSet _orderpropertyname_in_orderbylist732 = new BitSet(new ulong[]{0x2UL,0x200UL});
-		public static readonly BitSet _73_in_orderbylist735 = new BitSet(new ulong[]{0x400200000UL});
-		public static readonly BitSet _orderpropertyname_in_orderbylist738 = new BitSet(new ulong[]{0x2UL,0x200UL});
-		public static readonly BitSet _propertyname_in_orderpropertyname749 = new BitSet(new ulong[]{0x800000000000002UL});
-		public static readonly BitSet _SPACE_in_orderpropertyname772 = new BitSet(new ulong[]{0x80200UL});
-		public static readonly BitSet _ASC_in_orderpropertyname777 = new BitSet(new ulong[]{0x2UL});
-		public static readonly BitSet _DESC_in_orderpropertyname783 = new BitSet(new ulong[]{0x2UL});
-		public static readonly BitSet _INT_in_constant807 = new BitSet(new ulong[]{0x2UL});
-		public static readonly BitSet _BOOL_in_constant812 = new BitSet(new ulong[]{0x2UL});
-		public static readonly BitSet _STRING_in_constant817 = new BitSet(new ulong[]{0x2UL});
-		public static readonly BitSet _DATETIME_in_constant822 = new BitSet(new ulong[]{0x2UL});
-		public static readonly BitSet _LONG_in_constant827 = new BitSet(new ulong[]{0x2UL});
-		public static readonly BitSet _SINGLE_in_constant832 = new BitSet(new ulong[]{0x2UL});
-		public static readonly BitSet _DECIMAL_in_constant837 = new BitSet(new ulong[]{0x2UL});
-		public static readonly BitSet _DOUBLE_in_constant842 = new BitSet(new ulong[]{0x2UL});
-		public static readonly BitSet _GUID_in_constant847 = new BitSet(new ulong[]{0x2UL});
-		public static readonly BitSet _BYTE_in_constant852 = new BitSet(new ulong[]{0x2UL});
-		public static readonly BitSet _NULL_in_constant857 = new BitSet(new ulong[]{0x2UL});
-		public static readonly BitSet _identifierpart_in_propertyname870 = new BitSet(new ulong[]{0x2UL,0x400UL});
-		public static readonly BitSet _74_in_propertyname879 = new BitSet(new ulong[]{0x400200000UL});
-		public static readonly BitSet _subpropertyname_in_propertyname883 = new BitSet(new ulong[]{0x2UL});
-		public static readonly BitSet _propertyname_in_subpropertyname906 = new BitSet(new ulong[]{0x2UL});
-		public static readonly BitSet _IDENTIFIER_in_identifierpart921 = new BitSet(new ulong[]{0x2UL});
-		public static readonly BitSet _DYNAMICIDENTIFIER_in_identifierpart943 = new BitSet(new ulong[]{0x2UL});
+		public static readonly BitSet _apply_in_param127 = new BitSet(new ulong[]{0x2UL});
+		public static readonly BitSet _SKIP_in_skip138 = new BitSet(new ulong[]{0x10000000000UL});
+		public static readonly BitSet _INT_in_skip141 = new BitSet(new ulong[]{0x10000000002UL});
+		public static readonly BitSet _TOP_in_top152 = new BitSet(new ulong[]{0x10000000000UL});
+		public static readonly BitSet _INT_in_top155 = new BitSet(new ulong[]{0x10000000002UL});
+		public static readonly BitSet _FILTER_in_filter166 = new BitSet(new ulong[]{0x9629C93903BD8000UL,0xB2BUL});
+		public static readonly BitSet _filterexpression_in_filter169 = new BitSet(new ulong[]{0x2UL});
+		public static readonly BitSet _SELECT_in_select180 = new BitSet(new ulong[]{0x2001000000UL});
+		public static readonly BitSet _propertyname_in_select183 = new BitSet(new ulong[]{0x4000000000000002UL,0x2000UL});
+		public static readonly BitSet _SPACE_in_select187 = new BitSet(new ulong[]{0x800UL});
+		public static readonly BitSet _asexp_in_select190 = new BitSet(new ulong[]{0x2UL,0x2000UL});
+		public static readonly BitSet _77_in_select195 = new BitSet(new ulong[]{0x2001000000UL});
+		public static readonly BitSet _propertyname_in_select198 = new BitSet(new ulong[]{0x4000000000000002UL,0x2000UL});
+		public static readonly BitSet _SPACE_in_select202 = new BitSet(new ulong[]{0x800UL});
+		public static readonly BitSet _asexp_in_select205 = new BitSet(new ulong[]{0x2UL,0x2000UL});
+		public static readonly BitSet _AS_in_asexp221 = new BitSet(new ulong[]{0x4000000000000000UL});
+		public static readonly BitSet _SPACE_in_asexp224 = new BitSet(new ulong[]{0x2000000000UL});
+		public static readonly BitSet _IDENTIFIER_in_asexp227 = new BitSet(new ulong[]{0x2UL});
+		public static readonly BitSet _APPLY_in_apply236 = new BitSet(new ulong[]{0x10UL});
+		public static readonly BitSet _aggexpr_in_apply239 = new BitSet(new ulong[]{0x2UL});
+		public static readonly BitSet _applyTrafo_in_aggexpr248 = new BitSet(new ulong[]{0x2UL,0x4000UL});
+		public static readonly BitSet _78_in_aggexpr251 = new BitSet(new ulong[]{0x10UL});
+		public static readonly BitSet _applyTrafo_in_aggexpr254 = new BitSet(new ulong[]{0x2UL,0x4000UL});
+		public static readonly BitSet _aggregateTrafo_in_applyTrafo265 = new BitSet(new ulong[]{0x2UL});
+		public static readonly BitSet _AGGREGATE_in_aggregateTrafo274 = new BitSet(new ulong[]{0x0UL,0x800UL});
+		public static readonly BitSet _75_in_aggregateTrafo277 = new BitSet(new ulong[]{0x2001000000UL});
+		public static readonly BitSet _aggregateExpr_in_aggregateTrafo279 = new BitSet(new ulong[]{0x0UL,0x3000UL});
+		public static readonly BitSet _77_in_aggregateTrafo282 = new BitSet(new ulong[]{0x2001000000UL});
+		public static readonly BitSet _aggregateExpr_in_aggregateTrafo285 = new BitSet(new ulong[]{0x0UL,0x3000UL});
+		public static readonly BitSet _76_in_aggregateTrafo288 = new BitSet(new ulong[]{0x2UL});
+		public static readonly BitSet _propertyname_in_aggregateExpr297 = new BitSet(new ulong[]{0x4000000000000000UL});
+		public static readonly BitSet _SPACE_in_aggregateExpr300 = new BitSet(new ulong[]{0x0UL,0x80UL});
+		public static readonly BitSet _aggregateWith_in_aggregateExpr303 = new BitSet(new ulong[]{0x4000000000000000UL});
+		public static readonly BitSet _SPACE_in_aggregateExpr305 = new BitSet(new ulong[]{0x800UL});
+		public static readonly BitSet _asexp_in_aggregateExpr308 = new BitSet(new ulong[]{0x2UL});
+		public static readonly BitSet _WITH_in_aggregateWith318 = new BitSet(new ulong[]{0x4000000000000000UL});
+		public static readonly BitSet _SPACE_in_aggregateWith321 = new BitSet(new ulong[]{0x300000004000UL,0x4UL});
+		public static readonly BitSet _aggregateMethod_in_aggregateWith324 = new BitSet(new ulong[]{0x2UL});
+		public static readonly BitSet _EXPAND_in_expand354 = new BitSet(new ulong[]{0x2001000000UL});
+		public static readonly BitSet _propertyname_in_expand357 = new BitSet(new ulong[]{0x2UL,0x2000UL});
+		public static readonly BitSet _77_in_expand361 = new BitSet(new ulong[]{0x2001000000UL});
+		public static readonly BitSet _propertyname_in_expand364 = new BitSet(new ulong[]{0x2UL,0x2000UL});
+		public static readonly BitSet _INLINECOUNT_in_inlinecount376 = new BitSet(new ulong[]{0x80UL});
+		public static readonly BitSet _ALLPAGES_in_inlinecount379 = new BitSet(new ulong[]{0x2UL});
+		public static readonly BitSet _INLINECOUNT_in_inlinecount384 = new BitSet(new ulong[]{0x4000000000000UL});
+		public static readonly BitSet _NONE_in_inlinecount386 = new BitSet(new ulong[]{0x2UL});
+		public static readonly BitSet _IGNORED_in_ignored396 = new BitSet(new ulong[]{0x2000000000UL});
+		public static readonly BitSet _IDENTIFIER_in_ignored398 = new BitSet(new ulong[]{0x2UL});
+		public static readonly BitSet _orexpression_in_filterexpression412 = new BitSet(new ulong[]{0x4000000000000002UL});
+		public static readonly BitSet _SPACE_in_filterexpression416 = new BitSet(new ulong[]{0x80000000000000UL});
+		public static readonly BitSet _OR_in_filterexpression419 = new BitSet(new ulong[]{0x4000000000000000UL});
+		public static readonly BitSet _SPACE_in_filterexpression422 = new BitSet(new ulong[]{0x9629C93903BD8000UL,0xB2BUL});
+		public static readonly BitSet _orexpression_in_filterexpression425 = new BitSet(new ulong[]{0x4000000000000002UL});
+		public static readonly BitSet _andexpression_in_orexpression439 = new BitSet(new ulong[]{0x4000000000000002UL});
+		public static readonly BitSet _SPACE_in_orexpression443 = new BitSet(new ulong[]{0x100UL});
+		public static readonly BitSet _AND_in_orexpression446 = new BitSet(new ulong[]{0x4000000000000000UL});
+		public static readonly BitSet _SPACE_in_orexpression449 = new BitSet(new ulong[]{0x9629C93903BD8000UL,0xB2BUL});
+		public static readonly BitSet _andexpression_in_orexpression452 = new BitSet(new ulong[]{0x4000000000000002UL});
+		public static readonly BitSet _NOT_in_andexpression466 = new BitSet(new ulong[]{0x4000000000000000UL});
+		public static readonly BitSet _SPACE_in_andexpression469 = new BitSet(new ulong[]{0x9621C93903BD8000UL,0xB2BUL});
+		public static readonly BitSet _75_in_andexpression472 = new BitSet(new ulong[]{0x9629C93903BD8000UL,0xB2BUL});
+		public static readonly BitSet _filterexpression_in_andexpression474 = new BitSet(new ulong[]{0x0UL,0x1000UL});
+		public static readonly BitSet _76_in_andexpression477 = new BitSet(new ulong[]{0x2UL});
+		public static readonly BitSet _booleanexpression_in_andexpression481 = new BitSet(new ulong[]{0x2UL});
+		public static readonly BitSet _75_in_andexpression489 = new BitSet(new ulong[]{0x9629C93903BD8000UL,0xB2BUL});
+		public static readonly BitSet _filterexpression_in_andexpression491 = new BitSet(new ulong[]{0x0UL,0x1000UL});
+		public static readonly BitSet _76_in_andexpression494 = new BitSet(new ulong[]{0x2UL});
+		public static readonly BitSet _booleanexpression_in_andexpression498 = new BitSet(new ulong[]{0x2UL});
+		public static readonly BitSet _atom_in_booleanexpression514 = new BitSet(new ulong[]{0x4000000000000002UL});
+		public static readonly BitSet _SPACE_in_booleanexpression522 = new BitSet(new ulong[]{0x100600C4000000UL});
+		public static readonly BitSet _EQUALS_in_booleanexpression527 = new BitSet(new ulong[]{0x4000000000000000UL});
+		public static readonly BitSet _NOTEQUALS_in_booleanexpression533 = new BitSet(new ulong[]{0x4000000000000000UL});
+		public static readonly BitSet _GREATERTHAN_in_booleanexpression539 = new BitSet(new ulong[]{0x4000000000000000UL});
+		public static readonly BitSet _GREATERTHANOREQUAL_in_booleanexpression545 = new BitSet(new ulong[]{0x4000000000000000UL});
+		public static readonly BitSet _LESSTHAN_in_booleanexpression551 = new BitSet(new ulong[]{0x4000000000000000UL});
+		public static readonly BitSet _LESSTHANOREQUAL_in_booleanexpression557 = new BitSet(new ulong[]{0x4000000000000000UL});
+		public static readonly BitSet _SPACE_in_booleanexpression560 = new BitSet(new ulong[]{0x9621C93903BD8000UL,0x32BUL});
+		public static readonly BitSet _atom_in_booleanexpression564 = new BitSet(new ulong[]{0x2UL});
+		public static readonly BitSet _functioncall_in_atom616 = new BitSet(new ulong[]{0x2UL});
+		public static readonly BitSet _constant_in_atom622 = new BitSet(new ulong[]{0x2UL});
+		public static readonly BitSet _accessor_in_atom627 = new BitSet(new ulong[]{0x2UL});
+		public static readonly BitSet _function_in_functioncall639 = new BitSet(new ulong[]{0x0UL,0x800UL});
+		public static readonly BitSet _75_in_functioncall642 = new BitSet(new ulong[]{0x9621C93903BD8000UL,0x32BUL});
+		public static readonly BitSet _atom_in_functioncall644 = new BitSet(new ulong[]{0x0UL,0x3000UL});
+		public static readonly BitSet _77_in_functioncall648 = new BitSet(new ulong[]{0x9621C93903BD8000UL,0x32BUL});
+		public static readonly BitSet _atom_in_functioncall650 = new BitSet(new ulong[]{0x0UL,0x3000UL});
+		public static readonly BitSet _76_in_functioncall655 = new BitSet(new ulong[]{0x2UL});
+		public static readonly BitSet _propertyname_in_accessor667 = new BitSet(new ulong[]{0x2UL,0x4000UL});
+		public static readonly BitSet _78_in_accessor680 = new BitSet(new ulong[]{0x300000024240UL,0x4UL});
+		public static readonly BitSet _ANY_in_accessor685 = new BitSet(new ulong[]{0x0UL,0x800UL});
+		public static readonly BitSet _ALL_in_accessor691 = new BitSet(new ulong[]{0x0UL,0x800UL});
+		public static readonly BitSet _COUNT_in_accessor697 = new BitSet(new ulong[]{0x0UL,0x800UL});
+		public static readonly BitSet _MAX_in_accessor703 = new BitSet(new ulong[]{0x0UL,0x800UL});
+		public static readonly BitSet _MIN_in_accessor709 = new BitSet(new ulong[]{0x0UL,0x800UL});
+		public static readonly BitSet _SUM_in_accessor715 = new BitSet(new ulong[]{0x0UL,0x800UL});
+		public static readonly BitSet _AVERAGE_in_accessor721 = new BitSet(new ulong[]{0x0UL,0x800UL});
+		public static readonly BitSet _75_in_accessor728 = new BitSet(new ulong[]{0x2000000000UL,0x1000UL});
+		public static readonly BitSet _IDENTIFIER_in_accessor739 = new BitSet(new ulong[]{0x0UL,0x8000UL});
+		public static readonly BitSet _79_in_accessor741 = new BitSet(new ulong[]{0x4000000000000000UL});
+		public static readonly BitSet _SPACE_in_accessor743 = new BitSet(new ulong[]{0x9629C93903BD8000UL,0xB2BUL});
+		public static readonly BitSet _filterexpression_in_accessor745 = new BitSet(new ulong[]{0x0UL,0x1000UL});
+		public static readonly BitSet _76_in_accessor785 = new BitSet(new ulong[]{0x2UL});
+		public static readonly BitSet _ORDERBY_in_orderby872 = new BitSet(new ulong[]{0x2001000000UL});
+		public static readonly BitSet _orderbylist_in_orderby875 = new BitSet(new ulong[]{0x2UL});
+		public static readonly BitSet _orderpropertyname_in_orderbylist885 = new BitSet(new ulong[]{0x2UL,0x2000UL});
+		public static readonly BitSet _77_in_orderbylist888 = new BitSet(new ulong[]{0x2001000000UL});
+		public static readonly BitSet _orderpropertyname_in_orderbylist891 = new BitSet(new ulong[]{0x2UL,0x2000UL});
+		public static readonly BitSet _propertyname_in_orderpropertyname902 = new BitSet(new ulong[]{0x4000000000000002UL});
+		public static readonly BitSet _SPACE_in_orderpropertyname925 = new BitSet(new ulong[]{0x401000UL});
+		public static readonly BitSet _ASC_in_orderpropertyname930 = new BitSet(new ulong[]{0x2UL});
+		public static readonly BitSet _DESC_in_orderpropertyname936 = new BitSet(new ulong[]{0x2UL});
+		public static readonly BitSet _INT_in_constant960 = new BitSet(new ulong[]{0x2UL});
+		public static readonly BitSet _BOOL_in_constant965 = new BitSet(new ulong[]{0x2UL});
+		public static readonly BitSet _STRING_in_constant970 = new BitSet(new ulong[]{0x2UL});
+		public static readonly BitSet _DATETIME_in_constant975 = new BitSet(new ulong[]{0x2UL});
+		public static readonly BitSet _LONG_in_constant980 = new BitSet(new ulong[]{0x2UL});
+		public static readonly BitSet _SINGLE_in_constant985 = new BitSet(new ulong[]{0x2UL});
+		public static readonly BitSet _DECIMAL_in_constant990 = new BitSet(new ulong[]{0x2UL});
+		public static readonly BitSet _DOUBLE_in_constant995 = new BitSet(new ulong[]{0x2UL});
+		public static readonly BitSet _GUID_in_constant1000 = new BitSet(new ulong[]{0x2UL});
+		public static readonly BitSet _BYTE_in_constant1005 = new BitSet(new ulong[]{0x2UL});
+		public static readonly BitSet _NULL_in_constant1010 = new BitSet(new ulong[]{0x2UL});
+		public static readonly BitSet _identifierpart_in_propertyname1023 = new BitSet(new ulong[]{0x2UL,0x4000UL});
+		public static readonly BitSet _78_in_propertyname1032 = new BitSet(new ulong[]{0x2001000000UL});
+		public static readonly BitSet _subpropertyname_in_propertyname1036 = new BitSet(new ulong[]{0x2UL});
+		public static readonly BitSet _propertyname_in_subpropertyname1059 = new BitSet(new ulong[]{0x2UL});
+		public static readonly BitSet _IDENTIFIER_in_identifierpart1074 = new BitSet(new ulong[]{0x2UL});
+		public static readonly BitSet _DYNAMICIDENTIFIER_in_identifierpart1096 = new BitSet(new ulong[]{0x2UL});
 	}
 	#endregion Follow sets
 }
diff --git a/LinqToQuerystring/TreeNodes/Apply/AggregateNode.cs b/LinqToQuerystring/TreeNodes/Apply/AggregateNode.cs
new file mode 100644
index 0000000..f037d15
--- /dev/null
+++ b/LinqToQuerystring/TreeNodes/Apply/AggregateNode.cs
@@ -0,0 +1,69 @@
+using System.Collections.Generic;
+using System.Globalization;
+using System.Reflection;
+using System.Runtime.InteropServices.ComTypes;
+
+namespace LinqToQuerystring.TreeNodes
+{
+    using System;
+    using System.Linq;
+    using System.Linq.Expressions;
+
+    using Antlr.Runtime;
+
+    using LinqToQuerystring.TreeNodes.Base;
+
+    public class AggregateNode : SingleChildNode
+    {
+        public AggregateNode(Type inputType, IToken payload, TreeNodeFactory treeNodeFactory)
+            : base(inputType, payload, treeNodeFactory)
+        {
+        }
+
+        public override Expression BuildLinqExpression(IQueryable query, Expression expression, Expression item = null)
+        {
+            var parameter = item ?? Expression.Parameter(inputType, "o");
+
+            var childNodes = this.ChildNodes.ToList();
+
+            var addMethod = typeof(Dictionary<string, object>).GetMethod("Add");
+
+            var elements = new List<ElementInit>();
+
+            for (var i = 0; i < childNodes.Count; i = i + 3)
+            {
+                var propertyNode = childNodes.ElementAtOrDefault(i);
+                var withNode = childNodes.ElementAtOrDefault(i + 1) as WithNode;
+                var asNode = childNodes.ElementAtOrDefault(i + 2) as AsNode;
+
+                var selectorType = propertyNode is DynamicIdentifierNode
+                    ? typeof(Dictionary<string, object>)
+                    : inputType;
+
+                var property = propertyNode.BuildLinqExpression(query, expression, parameter);
+                var selector = Expression.Lambda(property, false, Expression.Parameter(selectorType, "o"));
+                var methodName = CultureInfo.InvariantCulture.TextInfo.ToTitleCase(withNode.ChildNode.Text);
+                var element = Expression.ElementInit(addMethod, Expression.Constant(asNode.ChildNode.Text)
+                    , Expression.Convert(Expression.Call(typeof(Enumerable), methodName, new [] { selectorType }, expression, selector), typeof(object)));
+
+                elements.Add(element);
+            }
+
+            var newDictionary = Expression.New(typeof(Dictionary<string, object>));
+            var init = Expression.ListInit(newDictionary, elements);
+
+            var lambda = Expression.Lambda(init, new[] { parameter as ParameterExpression });
+            return Expression.Call(typeof(Queryable), "Select", new[] { query.ElementType, typeof(Dictionary<string, object>) }, query.Expression, lambda);
+        }
+
+        public override int CompareTo(TreeNode other)
+        {
+            if (other is AggregateNode)
+            {
+                return 0;
+            }
+
+            return -1;
+        }
+    }
+}
\ No newline at end of file
diff --git a/LinqToQuerystring/TreeNodes/Apply/ApplyNode.cs b/LinqToQuerystring/TreeNodes/Apply/ApplyNode.cs
new file mode 100644
index 0000000..fe1652a
--- /dev/null
+++ b/LinqToQuerystring/TreeNodes/Apply/ApplyNode.cs
@@ -0,0 +1,40 @@
+using System.Collections.Generic;
+
+namespace LinqToQuerystring.TreeNodes
+{
+    using System;
+    using System.Linq;
+    using System.Linq.Expressions;
+
+    using Antlr.Runtime;
+
+    using LinqToQuerystring.TreeNodes.Base;
+
+    public class ApplyNode : SingleChildNode
+    {
+        public ApplyNode(Type inputType, IToken payload, TreeNodeFactory treeNodeFactory)
+            : base(inputType, payload, treeNodeFactory)
+        {
+        }
+
+        public override Expression BuildLinqExpression(IQueryable query, Expression expression, Expression item = null)
+        {
+            var result = ChildNode.BuildLinqExpression(query, expression, item);
+            foreach (var child in ChildNodes.Skip(1))
+            {
+                result = child.BuildLinqExpression(query, result, Expression.Parameter(typeof(Dictionary<string, object>)));
+            }
+            return result;
+        }
+
+        public override int CompareTo(TreeNode other)
+        {
+            if (other is AggregateNode)
+            {
+                return 0;
+            }
+
+            return -1;
+        }
+    }
+}
\ No newline at end of file
diff --git a/LinqToQuerystring/TreeNodes/Apply/WithNode.cs b/LinqToQuerystring/TreeNodes/Apply/WithNode.cs
new file mode 100644
index 0000000..ce8630a
--- /dev/null
+++ b/LinqToQuerystring/TreeNodes/Apply/WithNode.cs
@@ -0,0 +1,29 @@
+namespace LinqToQuerystring.TreeNodes
+{
+    using System;
+    using System.Linq;
+    using System.Linq.Expressions;
+
+    using Antlr.Runtime;
+
+    using LinqToQuerystring.TreeNodes.Base;
+
+    public class WithNode : SingleChildNode
+    {
+        public WithNode(Type inputType, IToken payload, TreeNodeFactory treeNodeFactory)
+            : base(inputType, payload, treeNodeFactory)
+        {
+        }
+
+        public override Expression BuildLinqExpression(IQueryable query, Expression expression, Expression item = null)
+        {
+            var child = this.ChildNodes.FirstOrDefault();
+            if (child != null)
+            {
+                return Expression.Constant(child.Text);
+            }
+
+            return item;
+        }
+    }
+}
diff --git a/LinqToQuerystring/TreeNodes/AsNode.cs b/LinqToQuerystring/TreeNodes/AsNode.cs
new file mode 100644
index 0000000..e20bbe5
--- /dev/null
+++ b/LinqToQuerystring/TreeNodes/AsNode.cs
@@ -0,0 +1,29 @@
+namespace LinqToQuerystring.TreeNodes
+{
+    using System;
+    using System.Linq;
+    using System.Linq.Expressions;
+
+    using Antlr.Runtime;
+
+    using LinqToQuerystring.TreeNodes.Base;
+
+    public class AsNode : SingleChildNode
+    {
+        public AsNode(Type inputType, IToken payload, TreeNodeFactory treeNodeFactory)
+            : base(inputType, payload, treeNodeFactory)
+        {
+        }
+
+        public override Expression BuildLinqExpression(IQueryable query, Expression expression, Expression item = null)
+        {
+            var child = this.ChildNodes.FirstOrDefault();
+            if (child != null)
+            {
+                return Expression.Constant(child.Text);
+            }
+
+            return item;
+        }
+    }
+}
diff --git a/LinqToQuerystring/TreeNodes/SelectNode.cs b/LinqToQuerystring/TreeNodes/SelectNode.cs
index 7420a4b..17172d3 100644
--- a/LinqToQuerystring/TreeNodes/SelectNode.cs
+++ b/LinqToQuerystring/TreeNodes/SelectNode.cs
@@ -1,4 +1,6 @@
-namespace LinqToQuerystring.TreeNodes
+using System.Text;
+
+namespace LinqToQuerystring.TreeNodes
 {
     using System;
     using System.Collections.Generic;
@@ -27,8 +29,46 @@ public override Expression BuildLinqExpression(IQueryable query, Expression expr
             Expression childExpression = fixedexpr;
 
             MethodInfo addMethod = typeof(Dictionary<string, object>).GetMethod("Add");
-            var elements = this.ChildNodes.Select(
-                o => Expression.ElementInit(addMethod, Expression.Constant(o.Text), Expression.Convert(o.BuildLinqExpression(query, childExpression, parameter), typeof(object))));
+
+            var childrenNodes = ChildNodes.ToList();
+
+            var elements = new List<ElementInit>();
+
+            for (var i = 0; i < childrenNodes.Count;)
+            {
+                var next = i + 1;
+                var node = childrenNodes[i];
+                AsNode asNode = null;
+
+                var nameToUse = GetUniquePropertyName(node);
+
+                if (next < childrenNodes.Count)
+                {
+                    asNode = childrenNodes[next] as AsNode;
+                    if (asNode != null)
+                    {
+                        nameToUse = asNode.ChildNode.Text;
+                    }
+                }
+
+                var element = Expression.ElementInit(addMethod, Expression.Constant(nameToUse)
+                                , Expression.Convert(node.BuildLinqExpression(query, childExpression, parameter), typeof(object)));
+
+                elements.Add(element);
+
+                if (asNode == null)
+                {
+                    i++;
+                }
+                else
+                {
+                    i = i + 2;
+                }
+            }
+            
+            //var elements = this.ChildNodes.Select(
+            //    o => Expression.ElementInit(addMethod, Expression.Constant(GetUniquePropertyName(o))
+            //        , Expression.Convert(o.BuildLinqExpression(query, childExpression, parameter), typeof(object))));
 
             var newDictionary = Expression.New(typeof(Dictionary<string, object>));
             var init = Expression.ListInit(newDictionary, elements);
@@ -37,6 +77,17 @@ public override Expression BuildLinqExpression(IQueryable query, Expression expr
             return Expression.Call(typeof(Queryable), "Select", new[] { query.ElementType, typeof(Dictionary<string, object>) }, query.Expression, lambda);
         }
 
+        private string GetUniquePropertyName(TreeNode node)
+        {
+            var builder = new StringBuilder(node.Text);
+            if (node.Children != null && node.Children.Any())
+            {
+                builder.Append("_");
+                builder.Append(GetUniquePropertyName(node.Children.First() as TreeNode));
+            }
+            return builder.ToString();
+        }
+
         public override int CompareTo(TreeNode other)
         {
             if (other is SelectNode)
diff --git a/LinqToQuerystring/TreeNodes/TreeNodeFactory.cs b/LinqToQuerystring/TreeNodes/TreeNodeFactory.cs
index 8b6fe2c..ee9c133 100644
--- a/LinqToQuerystring/TreeNodes/TreeNodeFactory.cs
+++ b/LinqToQuerystring/TreeNodes/TreeNodeFactory.cs
@@ -34,6 +34,14 @@ public override object Create(Antlr.Runtime.IToken token)
                     return new TopNode(inputType, token, this);
                 case LinqToQuerystringLexer.SKIP:
                     return new SkipNode(inputType, token, this);
+                case LinqToQuerystringLexer.AS:
+                    return new AsNode(inputType, token, this);
+                case LinqToQuerystringLexer.WITH:
+                    return new WithNode(inputType, token, this);
+                case LinqToQuerystringLexer.APPLY:
+                    return new ApplyNode(inputType, token, this);
+                case LinqToQuerystringLexer.AGGREGATE:
+                    return new AggregateNode(inputType, token, this);
                 case LinqToQuerystringLexer.ORDERBY:
                     return new OrderByNode(inputType, token, this);
                 case LinqToQuerystringLexer.FILTER: