querybuilder 0.7.0 → 0.8.0

data/.gitignore

@@ -5,4 +5,5 @@ Makefile
 lib/*.o
 lib/*.bundle
 lib/*.so
-coverage
+coverage
+log

data/History.txt

@@ -1,3 +1,11 @@
+== 0.8.0 2010-07-22
+
+* Major enhancements:
+  * Better handling of mixed 'or' clauses.
+  * Allowing ':' in relations and scopes.
+  * Raises a SyntaxError on non-closing parenthesis.
+  * Started to fix some issues with for PostgreSQL.
+
 == 0.7.0 2010-05-27
 
 * Major enhancements:

data/Rakefile

@@ -74,8 +74,9 @@ end
 desc "Build native extensions"
 task :build => :ragel do
   [
-    "ruby lib/extconf.rb",
-    "cd lib && make",
+    'ruby lib/extconf.rb',
+    'mv Makefile lib/',
+    'cd lib && make',
   ].each do |cmd|
     puts cmd
     system cmd

data/lib/query_builder/info.rb

@@ -1,3 +1,3 @@
 module QueryBuilder
-  VERSION = '0.7.0'
+  VERSION = '0.8.0'
 end

data/lib/query_builder/processor.rb

@@ -141,6 +141,7 @@ module QueryBuilder
 
         @context = opts.merge(:first => true, :last => true)
         @query = Query.new(self.class)
+        @query.main_class = @opts[:main_class] if @opts[:main_class]
         before_process
 
         process_all
@@ -218,24 +219,64 @@ module QueryBuilder
         end
 
         clauses.map! do |clause|
-          process(clause)
-          query = @query
-          @query = Query.new(this.class)
+          query = @query.dup
+          with_query(query) do
+            process(clause)
+          end
           query
         end
 
-        merge_queries(clauses.reverse)
+        @query = merge_queries(clauses.reverse)
       end
 
-      def merge_queries(queries)
-        @query = queries.first
-        @query.tables = queries.inject([]) {|list, query| list + query.tables}.uniq
+      def merge_queries(queries, merge_filters = true)
+        tables = []
+        table_alias = {}
+
+        queries.each do |query|
+          tables += query.tables
+          table_alias.merge!(query.table_alias)
+        end
+
+        tables.uniq!
+
+        queries.each do |query|
+          missing_tables = tables - query.tables
+          missing_tables.each do |missing_table|
+            if missing_table =~ /^(.+) AS (.+)$/
+              resolve_missing_table(query, $1, $2)
+            else
+              resolve_missing_table(query, missing_table, missing_table)
+            end
+          end
+        end
+
+        query = queries.first
+        query.tables = tables
+        query.table_alias = table_alias
+
+        query.where = [merge_or_filters(queries)] if merge_filters
+
+        query.distinct = true
+
+        # FIXME: !! We need to resolve main_class from different 'or' clauses !!
+        # query.main_class = ...
+
+        query
+      end
+
+      # Fix every query to work with the final list of tables (insert dummy clauses for example).
+      def resolve_missing_table(query, table_alias, table_name)
+        # raise an error
+        raise QueryBuilder::Error.new("Could not resolve missing '#{table_name}' in OR clause.")
+      end
+
+      def merge_or_filters(queries)
         filters = queries.map do |query|
           query.where.size > 1 ? "(#{query.filter})" : query.where.first
         end
 
-        @query.where = ["(#{filters.join(' OR ')})"]
-        distinct!
+        "(#{filters.join(' OR ')})"
       end
 
       def process_clause_par(content)
@@ -313,7 +354,9 @@ module QueryBuilder
         elsif (context[:scope_type] = :context) && context_relation(relation)
         elsif (context[:scope_type] = :filter)  && filter_relation(relation)
         else
-          raise QueryBuilder::SyntaxError.new("Unknown relation '#{relation}'.")
+          # Strange Ruby bug ? Using dstring directly in new method generates garbled UTF8...
+          msg = "Unknown relation '#{relation}'."
+          raise QueryBuilder::SyntaxError.new(msg)
         end
       end
 
@@ -421,7 +464,32 @@ module QueryBuilder
       end
 
       def process_or(left, right)
-        "(#{this.process(left)} OR #{this.process(right)})"
+        left_query  = @query.dup
+        left_query.where = []
+        right_query = @query.dup
+        right_query.where = []
+
+        with_query(left_query) do
+          add_filter process(left)
+        end
+
+        with_query(right_query) do
+          add_filter process(right)
+        end
+
+        merge_queries([left_query, right_query], false)
+        @query.tables      = left_query.tables
+        @query.table_alias = left_query.table_alias
+        @query.distinct    = left_query.distinct
+
+        merge_or_filters([left_query, right_query])
+      end
+
+      def with_query(query)
+        bak = @query
+        @query = query
+        yield
+        @query = bak
       end
 
       def process_op(op, left, right)
@@ -485,7 +553,7 @@ module QueryBuilder
         if fld && (page_size = @query.limit[/ LIMIT (\d+)/,1])
           @query.page_size = [2, page_size.to_i].max
           @query.offset = " OFFSET #{insert_bind("((#{fld}.to_i > 0 ? #{fld}.to_i : 1)-1)*#{@query.page_size}")}"
-          @query.pagination_key = fld
+          @query.pagination_key ||= paginate_fld.last
         else
           raise QueryBuilder::SyntaxError.new("Invalid paginate clause '#{paginate}'.")
         end
@@ -564,6 +632,7 @@ module QueryBuilder
           end
 
           @query.processor_class = processor.class
+          @query.main_class = QueryBuilder.resolve_const(processor.class.main_class)
           update_processor(processor)
         end
       end
@@ -577,6 +646,7 @@ module QueryBuilder
 
       def custom_query(relation)
         return false unless first? && last?  # current safety net until "from" is correctly implemented and tested
+
         custom_queries = self.class.custom_queries[self.class]
         if custom_queries &&
            custom_queries[@opts[:custom_query_group]] &&
@@ -684,7 +754,8 @@ module QueryBuilder
       end
 
       def set_main_class(klass)
-        @query.set_main_class(klass)
+        # FIXME: be clever on different klass settings in filters (AND / OR)...
+        @query.main_class = klass
       end
 
       def needs_join_table(*args)

data/lib/query_builder/query.rb

@@ -1,8 +1,16 @@
+require 'active_record'
+
 module QueryBuilder
   class Query
     attr_accessor :processor_class, :distinct, :select, :tables, :table_alias, :where,
                   :limit, :offset, :page_size, :order, :group, :error, :attributes_alias,
-                  :pagination_key
+                  :pagination_key, :main_class, :context
+
+    class << self
+      def adapter
+        @adapter ||= ActiveRecord::Base.connection.class.name.split('::').last[/(.+)Adapter/,1].downcase
+      end
+    end
 
     def initialize(processor_class)
       @processor_class = processor_class
@@ -41,19 +49,6 @@ module QueryBuilder
       QueryBuilder.resolve_const(klass)
     end
 
-    # Define the class of the returned object. If a previous class
-    # has already been defined, try to find a common ancestor or revert
-    # to the default.
-    def set_main_class(klass)
-      if @main_class
-        # TODO
-        # For now: revert to default
-        @main_class = self.default_class
-      else
-        @main_class = klass
-      end
-    end
-
     def add_filter(filter)
       @where << filter
     end
@@ -140,6 +135,15 @@ module QueryBuilder
       end
     end
 
+    # Duplicate query, avoiding mutual
+    def dup
+      other = super
+      %w{tables table_alias where}.each do |k|
+        other.send("#{k}=", other.send(k).dup)
+      end
+      other
+    end
+
     # Used after setting @tables from custom query.
     def rebuild_tables!
       @table_alias = {}
@@ -173,7 +177,7 @@ module QueryBuilder
       def get_alias(use_name, table_name = nil, avoid_alias = true)
         table_name ||= use_name
         @table_alias[use_name] ||= []
-        if avoid_alias && !@tables.include?(use_name)
+        if avoid_alias && !@tables.include?(table_name)
           alias_name = use_name
         elsif @tables.include?(use_name)
           # links, li1, li2, li3
@@ -220,10 +224,21 @@ module QueryBuilder
 
         group = @group
         if !group && @distinct
-          group = @tables.size > 1 ? " GROUP BY #{main_table}.id" : " GROUP BY id"
+          key =  @tables.size > 1 ? "#{main_table}.id" : 'id'
+
+          case self.class.adapter
+          when 'postgresql'
+            if @order.to_s =~ /ORDER BY (.*)/
+              keys = $1.split(',').map {|k| k[/^(.*)\s/,1]}
+              key = ([key] + keys).join(',')
+            end
+            distinct = " DISTINCT ON (#{key})"
+          else
+            group    = " GROUP BY #{key}"
+          end
         end
 
-        "SELECT #{(@select || ["#{main_table}.*"]).join(',')} FROM #{table_list.flatten.sort.join(',')}" + (@where == [] ? '' : " WHERE #{filter}") + group.to_s + @order.to_s + @limit.to_s + @offset.to_s
+        "SELECT#{distinct} #{(@select || ["#{main_table}.*"]).join(',')} FROM #{table_list.flatten.sort.join(',')}" + (@where == [] ? '' : " WHERE #{filter}") + group.to_s + @order.to_s + @limit.to_s + @offset.to_s
       end
 
       def count_statement

data/lib/querybuilder_ext.c

@@ -108,7 +108,7 @@ void Init_querybuilder_ext() {
 #define APPLY_OP(elem) last = rb_funcall(self, _apply_op, 2, stack, elem);
 
 
-#line 366 "querybuilder_ext.rl"
+#line 368 "querybuilder_ext.rl"
 
 
 
@@ -139,94 +139,95 @@ static const char _querybuilder_actions[] = {
 };
 
 static const short _querybuilder_key_offsets[] = {
-	0, 0, 9, 13, 16, 17, 18, 21, 
-	30, 34, 37, 38, 39, 40, 49, 58, 
-	66, 67, 68, 69, 70, 73, 77, 78, 
-	86, 94, 104, 105, 106, 107, 108, 114, 
-	120, 122, 128, 134, 136, 141, 142, 143, 
-	144, 145, 146, 152, 158, 160, 165, 166, 
-	167, 168, 169, 170, 171, 172, 180, 188, 
-	196, 198, 199, 200, 201, 204, 208, 209, 
-	217, 225, 235, 236, 237, 241, 242, 243, 
-	244, 245, 253, 261, 271, 279, 287, 297, 
-	298, 301, 309, 317, 319, 323, 324, 325, 
-	326, 327, 330, 345, 347, 355, 370, 371, 
-	374, 377, 379, 379, 379, 388, 396, 404, 
-	418, 434, 436, 436, 440, 448, 449, 450, 
-	453, 468, 470, 481, 483, 493, 507, 508, 
-	509, 518, 519, 522, 525, 526, 527, 528, 
-	530, 533, 538, 539, 540, 541, 549, 551, 
-	552, 555, 560, 561, 562, 565, 567, 568, 
-	571, 572, 573, 574, 575, 576, 577, 578, 
-	579, 580, 581, 583, 584, 587, 591, 592, 
-	593, 595, 599, 600, 601, 602, 603, 604, 
-	606, 607, 608, 609, 610, 611, 614, 629, 
-	631, 639, 654, 655, 658, 661, 663, 663, 
-	663, 672, 680, 688, 702, 718, 720, 720, 
-	724, 732, 733, 734, 737, 752, 754, 765, 
-	767, 777, 791, 792, 793, 802, 803, 806, 
-	809, 810, 811, 812, 814, 817, 822, 823, 
-	824, 825, 833, 835, 836, 839, 844, 845, 
-	846, 849, 851, 852, 855, 856, 857, 858, 
-	859, 860, 861, 862, 863, 864, 865, 867, 
-	868, 871, 875, 876, 877, 879, 883, 884, 
-	885, 886, 887, 888, 890, 891, 892, 893, 
-	894, 895, 909, 910, 910, 911, 912, 913, 
-	927, 928, 928, 936, 937, 938, 939, 940, 
-	949, 957, 958, 961, 969, 977, 978, 979, 
-	980, 981, 984, 999, 1001, 1009, 1024, 1025, 
-	1028, 1031, 1033, 1033, 1033, 1042, 1050, 1058, 
-	1072, 1088, 1090, 1090, 1094, 1102, 1103, 1104, 
-	1107, 1122, 1124, 1135, 1137, 1147, 1161, 1162, 
-	1163, 1172, 1173, 1176, 1179, 1180, 1181, 1182, 
-	1184, 1187, 1192, 1193, 1194, 1195, 1203, 1205, 
-	1206, 1209, 1214, 1215, 1216, 1219, 1221, 1222, 
-	1225, 1226, 1227, 1228, 1229, 1230, 1231, 1232, 
-	1233, 1234, 1235, 1237, 1238, 1241, 1245, 1246, 
-	1247, 1249, 1253, 1254, 1255, 1256, 1257, 1258, 
-	1260, 1261, 1262, 1263, 1264, 1265, 1279, 1280, 
-	1280, 1295, 1297, 1306, 1328, 1343, 1344, 1347, 
-	1350, 1352, 1352, 1352, 1362, 1370, 1378, 1393, 
-	1409, 1411, 1411, 1415, 1424, 1441, 1442, 1443, 
-	1446, 1447, 1449, 1450, 1453, 1458, 1459, 1460, 
-	1461, 1470, 1472, 1473, 1476, 1481, 1482, 1483, 
-	1486, 1487, 1488, 1489, 1490, 1491, 1492, 1494, 
-	1495, 1498, 1502, 1503, 1504, 1506, 1518, 1520, 
-	1531, 1546, 1547, 1548, 1558, 1559, 1560, 1561, 
-	1564, 1565, 1566, 1567, 1568, 1569, 1570, 1571, 
-	1572, 1573, 1574, 1575, 1576, 1577, 1578, 1579, 
-	1580, 1581, 1581, 1590, 1594, 1598, 1603, 1604, 
-	1605, 1606, 1615, 1624, 1631, 1632, 1635, 1643, 
-	1652, 1653, 1654, 1655, 1656, 1659, 1674, 1676, 
-	1685, 1708, 1723, 1724, 1727, 1730, 1732, 1732, 
-	1732, 1742, 1750, 1758, 1773, 1789, 1791, 1791, 
-	1795, 1804, 1822, 1823, 1824, 1827, 1828, 1830, 
-	1832, 1835, 1840, 1841, 1842, 1843, 1852, 1854, 
-	1855, 1858, 1863, 1864, 1865, 1868, 1869, 1870, 
-	1871, 1872, 1873, 1874, 1876, 1877, 1880, 1884, 
-	1885, 1886, 1888, 1900, 1902, 1913, 1928, 1929, 
-	1930, 1940, 1941, 1942, 1943, 1946, 1947, 1948, 
-	1949, 1950, 1951, 1952, 1953, 1954, 1955, 1956, 
-	1957, 1958, 1959, 1960, 1961, 1962, 1963, 1963, 
-	1972, 1981, 1992, 1999, 2005, 2010, 2014, 2017, 
-	2028, 2035, 2058, 2076, 2099, 2122, 2140, 2163, 
-	2174, 2185, 2208, 2226, 2249, 2249
+	0, 0, 10, 14, 17, 18, 19, 22, 
+	32, 36, 39, 40, 41, 42, 52, 62, 
+	71, 72, 73, 74, 75, 78, 82, 83, 
+	92, 101, 112, 113, 114, 115, 116, 122, 
+	128, 130, 136, 142, 144, 149, 150, 151, 
+	152, 153, 154, 160, 166, 168, 173, 174, 
+	175, 176, 177, 178, 179, 180, 189, 198, 
+	207, 209, 210, 211, 212, 215, 219, 220, 
+	229, 238, 249, 250, 251, 255, 256, 257, 
+	258, 259, 268, 277, 288, 297, 306, 317, 
+	318, 321, 330, 339, 341, 345, 346, 347, 
+	348, 349, 352, 368, 370, 378, 394, 395, 
+	398, 401, 403, 403, 403, 412, 421, 430, 
+	445, 462, 464, 464, 468, 476, 477, 478, 
+	481, 497, 499, 510, 512, 522, 537, 538, 
+	539, 548, 549, 552, 555, 556, 557, 558, 
+	560, 563, 568, 569, 570, 571, 579, 581, 
+	582, 585, 590, 591, 592, 595, 597, 598, 
+	601, 602, 603, 604, 605, 606, 607, 608, 
+	609, 610, 611, 613, 614, 617, 621, 622, 
+	623, 625, 629, 630, 631, 632, 633, 634, 
+	636, 637, 638, 639, 640, 641, 644, 660, 
+	662, 670, 686, 687, 690, 693, 695, 695, 
+	695, 704, 713, 722, 737, 754, 756, 756, 
+	760, 768, 769, 770, 773, 789, 791, 802, 
+	804, 814, 829, 830, 831, 840, 841, 844, 
+	847, 848, 849, 850, 852, 855, 860, 861, 
+	862, 863, 871, 873, 874, 877, 882, 883, 
+	884, 887, 889, 890, 893, 894, 895, 896, 
+	897, 898, 899, 900, 901, 902, 903, 905, 
+	906, 909, 913, 914, 915, 917, 921, 922, 
+	923, 924, 925, 926, 928, 929, 930, 931, 
+	932, 933, 948, 949, 949, 950, 951, 952, 
+	967, 968, 968, 977, 978, 979, 980, 981, 
+	991, 1000, 1001, 1004, 1013, 1022, 1023, 1024, 
+	1025, 1026, 1029, 1045, 1047, 1055, 1071, 1072, 
+	1075, 1078, 1080, 1080, 1080, 1089, 1098, 1107, 
+	1122, 1139, 1141, 1141, 1145, 1153, 1154, 1155, 
+	1158, 1174, 1176, 1187, 1189, 1199, 1214, 1215, 
+	1216, 1225, 1226, 1229, 1232, 1233, 1234, 1235, 
+	1237, 1240, 1245, 1246, 1247, 1248, 1256, 1258, 
+	1259, 1262, 1267, 1268, 1269, 1272, 1274, 1275, 
+	1278, 1279, 1280, 1281, 1282, 1283, 1284, 1285, 
+	1286, 1287, 1288, 1290, 1291, 1294, 1298, 1299, 
+	1300, 1302, 1306, 1307, 1308, 1309, 1310, 1311, 
+	1313, 1314, 1315, 1316, 1317, 1318, 1333, 1334, 
+	1334, 1350, 1352, 1361, 1383, 1399, 1400, 1403, 
+	1406, 1408, 1408, 1408, 1418, 1427, 1436, 1452, 
+	1469, 1471, 1471, 1475, 1484, 1501, 1502, 1503, 
+	1506, 1507, 1509, 1510, 1513, 1518, 1519, 1520, 
+	1521, 1530, 1532, 1533, 1536, 1541, 1542, 1543, 
+	1546, 1547, 1548, 1549, 1550, 1551, 1552, 1554, 
+	1555, 1558, 1562, 1563, 1564, 1566, 1578, 1580, 
+	1591, 1607, 1608, 1609, 1619, 1620, 1621, 1622, 
+	1625, 1626, 1627, 1628, 1629, 1630, 1631, 1632, 
+	1633, 1634, 1635, 1636, 1637, 1638, 1639, 1640, 
+	1641, 1642, 1642, 1652, 1656, 1660, 1665, 1666, 
+	1667, 1668, 1678, 1688, 1695, 1696, 1699, 1708, 
+	1718, 1719, 1720, 1721, 1722, 1725, 1741, 1743, 
+	1752, 1775, 1791, 1792, 1795, 1798, 1800, 1800, 
+	1800, 1810, 1819, 1828, 1844, 1861, 1863, 1863, 
+	1867, 1876, 1894, 1895, 1896, 1899, 1900, 1902, 
+	1904, 1907, 1912, 1913, 1914, 1915, 1924, 1926, 
+	1927, 1930, 1935, 1936, 1937, 1940, 1941, 1942, 
+	1943, 1944, 1945, 1946, 1948, 1949, 1952, 1956, 
+	1957, 1958, 1960, 1972, 1974, 1985, 2001, 2002, 
+	2003, 2013, 2014, 2015, 2016, 2019, 2020, 2021, 
+	2022, 2023, 2024, 2025, 2026, 2027, 2028, 2029, 
+	2030, 2031, 2032, 2033, 2034, 2035, 2036, 2036, 
+	2045, 2054, 2065, 2072, 2078, 2083, 2087, 2090, 
+	2101, 2108, 2131, 2149, 2172, 2195, 2213, 2236, 
+	2247, 2258, 2281, 2299, 2322, 2322
 };
 
 static const char _querybuilder_trans_keys[] = {
-	32, 40, 95, 9, 10, 65, 90, 97, 
-	122, 32, 41, 9, 10, 32, 9, 10, 
-	110, 100, 32, 9, 10, 32, 40, 95, 
-	9, 10, 65, 90, 97, 122, 32, 41, 
-	9, 10, 32, 9, 10, 114, 111, 109, 
-	32, 40, 95, 9, 10, 65, 90, 97, 
-	122, 32, 40, 95, 9, 10, 65, 90, 
-	97, 122, 32, 95, 9, 10, 65, 90, 
-	97, 122, 114, 111, 117, 112, 32, 9, 
-	10, 32, 98, 9, 10, 121, 32, 95, 
-	9, 10, 65, 90, 97, 122, 32, 95, 
-	9, 10, 65, 90, 97, 122, 32, 44, 
-	46, 95, 9, 10, 65, 90, 97, 122, 
+	32, 40, 58, 95, 9, 10, 65, 90, 
+	97, 122, 32, 41, 9, 10, 32, 9, 
+	10, 110, 100, 32, 9, 10, 32, 40, 
+	58, 95, 9, 10, 65, 90, 97, 122, 
+	32, 41, 9, 10, 32, 9, 10, 114, 
+	111, 109, 32, 40, 58, 95, 9, 10, 
+	65, 90, 97, 122, 32, 40, 58, 95, 
+	9, 10, 65, 90, 97, 122, 32, 58, 
+	95, 9, 10, 65, 90, 97, 122, 114, 
+	111, 117, 112, 32, 9, 10, 32, 98, 
+	9, 10, 121, 32, 58, 95, 9, 10, 
+	65, 90, 97, 122, 32, 58, 95, 9, 
+	10, 65, 90, 97, 122, 32, 44, 46, 
+	58, 95, 9, 10, 65, 90, 97, 122, 
 	105, 109, 105, 116, 32, 45, 9, 10, 
 	48, 57, 32, 45, 9, 10, 48, 57, 
 	48, 57, 32, 44, 9, 10, 48, 57, 
@@ -235,129 +236,50 @@ static const char _querybuilder_trans_keys[] = {
 	101, 116, 32, 45, 9, 10, 48, 57, 
 	32, 45, 9, 10, 48, 57, 48, 57, 
 	32, 9, 10, 48, 57, 97, 103, 105, 
-	110, 97, 116, 101, 32, 95, 9, 10, 
-	65, 90, 97, 122, 32, 95, 9, 10, 
-	65, 90, 97, 122, 32, 95, 9, 10, 
-	65, 90, 97, 122, 102, 114, 100, 101, 
-	114, 32, 9, 10, 32, 98, 9, 10, 
-	121, 32, 95, 9, 10, 65, 90, 97, 
-	122, 32, 95, 9, 10, 65, 90, 97, 
-	122, 32, 44, 46, 95, 9, 10, 65, 
-	90, 97, 122, 83, 67, 32, 44, 9, 
-	10, 69, 115, 99, 101, 32, 95, 9, 
-	10, 65, 90, 97, 122, 32, 95, 9, 
+	110, 97, 116, 101, 32, 58, 95, 9, 
+	10, 65, 90, 97, 122, 32, 58, 95, 
+	9, 10, 65, 90, 97, 122, 32, 58, 
+	95, 9, 10, 65, 90, 97, 122, 102, 
+	114, 100, 101, 114, 32, 9, 10, 32, 
+	98, 9, 10, 121, 32, 58, 95, 9, 
+	10, 65, 90, 97, 122, 32, 58, 95, 
+	9, 10, 65, 90, 97, 122, 32, 44, 
+	46, 58, 95, 9, 10, 65, 90, 97, 
+	122, 83, 67, 32, 44, 9, 10, 69, 
+	115, 99, 101, 32, 58, 95, 9, 10, 
+	65, 90, 97, 122, 32, 58, 95, 9, 
 	10, 65, 90, 97, 122, 32, 44, 46, 
-	95, 9, 10, 65, 90, 97, 122, 32, 
-	95, 9, 10, 65, 90, 97, 122, 32, 
-	95, 9, 10, 65, 90, 97, 122, 32, 
-	44, 46, 95, 9, 10, 65, 90, 97, 
-	122, 110, 32, 9, 10, 32, 95, 9, 
-	10, 65, 90, 97, 122, 32, 95, 9, 
-	10, 65, 90, 97, 122, 102, 114, 32, 
-	100, 9, 10, 104, 101, 114, 101, 32, 
-	9, 10, 32, 34, 35, 39, 40, 45, 
-	95, 9, 10, 48, 57, 65, 90, 97, 
-	122, 34, 92, 32, 43, 45, 61, 9, 
-	10, 60, 62, 32, 34, 35, 39, 40, 
-	45, 95, 9, 10, 48, 57, 65, 90, 
+	58, 95, 9, 10, 65, 90, 97, 122, 
+	32, 58, 95, 9, 10, 65, 90, 97, 
+	122, 32, 58, 95, 9, 10, 65, 90, 
+	97, 122, 32, 44, 46, 58, 95, 9, 
+	10, 65, 90, 97, 122, 110, 32, 9, 
+	10, 32, 58, 95, 9, 10, 65, 90, 
+	97, 122, 32, 58, 95, 9, 10, 65, 
+	90, 97, 122, 102, 114, 32, 100, 9, 
+	10, 104, 101, 114, 101, 32, 9, 10, 
+	32, 34, 35, 39, 40, 45, 58, 95, 
+	9, 10, 48, 57, 65, 90, 97, 122, 
+	34, 92, 32, 43, 45, 61, 9, 10, 
+	60, 62, 32, 34, 35, 39, 40, 45, 
+	58, 95, 9, 10, 48, 57, 65, 90, 
 	97, 122, 123, 34, 92, 125, 34, 92, 
 	125, 34, 92, 32, 43, 45, 46, 61, 
-	9, 10, 60, 62, 32, 95, 9, 10, 
-	65, 90, 97, 122, 32, 95, 9, 10, 
-	65, 90, 97, 122, 32, 43, 45, 46, 
-	61, 95, 9, 10, 60, 62, 65, 90, 
-	97, 122, 32, 34, 35, 39, 40, 45, 
-	61, 95, 9, 10, 48, 57, 65, 90, 
-	97, 122, 39, 92, 32, 41, 9, 10, 
-	32, 43, 45, 61, 9, 10, 60, 62, 
-	110, 100, 32, 9, 10, 32, 34, 35, 
-	39, 40, 45, 95, 9, 10, 48, 57, 
-	65, 90, 97, 122, 48, 57, 32, 43, 
-	45, 46, 61, 9, 10, 48, 57, 60, 
-	62, 48, 57, 32, 43, 45, 61, 9, 
-	10, 48, 57, 60, 62, 32, 43, 45, 
-	46, 61, 95, 9, 10, 60, 62, 65, 
-	90, 97, 122, 97, 121, 32, 43, 45, 
-	61, 115, 9, 10, 60, 62, 113, 32, 
-	9, 10, 101, 114, 116, 111, 117, 114, 
-	110, 115, 32, 9, 10, 32, 78, 110, 
-	9, 10, 85, 76, 76, 32, 43, 45, 
-	61, 9, 10, 60, 62, 111, 117, 116, 
-	32, 9, 10, 32, 78, 110, 9, 10, 
-	108, 108, 101, 105, 116, 107, 109, 101, 
-	97, 105, 111, 116, 99, 104, 110, 117, 
-	116, 101, 110, 116, 104, 101, 111, 116, 
-	32, 9, 10, 32, 108, 9, 10, 105, 
-	107, 102, 114, 32, 100, 9, 10, 101, 
-	99, 111, 110, 100, 101, 104, 101, 107, 
-	101, 114, 101, 32, 9, 10, 32, 34, 
-	35, 39, 40, 45, 95, 9, 10, 48, 
-	57, 65, 90, 97, 122, 34, 92, 32, 
-	43, 45, 61, 9, 10, 60, 62, 32, 
-	34, 35, 39, 40, 45, 95, 9, 10, 
-	48, 57, 65, 90, 97, 122, 123, 34, 
-	92, 125, 34, 92, 125, 34, 92, 32, 
-	43, 45, 46, 61, 9, 10, 60, 62, 
-	32, 95, 9, 10, 65, 90, 97, 122, 
-	32, 95, 9, 10, 65, 90, 97, 122, 
-	32, 43, 45, 46, 61, 95, 9, 10, 
-	60, 62, 65, 90, 97, 122, 32, 34, 
-	35, 39, 40, 45, 61, 95, 9, 10, 
+	9, 10, 60, 62, 32, 58, 95, 9, 
+	10, 65, 90, 97, 122, 32, 58, 95, 
+	9, 10, 65, 90, 97, 122, 32, 43, 
+	45, 46, 58, 61, 95, 9, 10, 60, 
+	62, 65, 90, 97, 122, 32, 34, 35, 
+	39, 40, 45, 58, 61, 95, 9, 10, 
 	48, 57, 65, 90, 97, 122, 39, 92, 
 	32, 41, 9, 10, 32, 43, 45, 61, 
 	9, 10, 60, 62, 110, 100, 32, 9, 
-	10, 32, 34, 35, 39, 40, 45, 95, 
-	9, 10, 48, 57, 65, 90, 97, 122, 
-	48, 57, 32, 43, 45, 46, 61, 9, 
-	10, 48, 57, 60, 62, 48, 57, 32, 
-	43, 45, 61, 9, 10, 48, 57, 60, 
-	62, 32, 43, 45, 46, 61, 95, 9, 
-	10, 60, 62, 65, 90, 97, 122, 97, 
-	121, 32, 43, 45, 61, 115, 9, 10, 
-	60, 62, 113, 32, 9, 10, 101, 114, 
-	116, 111, 117, 114, 110, 115, 32, 9, 
-	10, 32, 78, 110, 9, 10, 85, 76, 
-	76, 32, 43, 45, 61, 9, 10, 60, 
-	62, 111, 117, 116, 32, 9, 10, 32, 
-	78, 110, 9, 10, 108, 108, 101, 105, 
-	116, 107, 109, 101, 97, 105, 111, 116, 
-	99, 104, 110, 117, 116, 101, 110, 116, 
-	104, 101, 111, 116, 32, 9, 10, 32, 
-	108, 9, 10, 105, 107, 102, 114, 32, 
-	100, 9, 10, 101, 99, 111, 110, 100, 
-	101, 104, 101, 107, 101, 97, 97, 32, 
-	43, 45, 46, 61, 95, 9, 10, 60, 
-	62, 65, 90, 97, 122, 101, 101, 97, 
-	97, 32, 43, 45, 46, 61, 95, 9, 
-	10, 60, 62, 65, 90, 97, 122, 101, 
-	32, 95, 9, 10, 65, 90, 97, 122, 
-	104, 114, 111, 109, 32, 40, 95, 9, 
-	10, 65, 90, 97, 122, 32, 95, 9, 
-	10, 65, 90, 97, 122, 110, 32, 9, 
-	10, 32, 95, 9, 10, 65, 90, 97, 
-	122, 32, 95, 9, 10, 65, 90, 97, 
-	122, 104, 101, 114, 101, 32, 9, 10, 
-	32, 34, 35, 39, 40, 45, 95, 9, 
-	10, 48, 57, 65, 90, 97, 122, 34, 
-	92, 32, 43, 45, 61, 9, 10, 60, 
-	62, 32, 34, 35, 39, 40, 45, 95, 
-	9, 10, 48, 57, 65, 90, 97, 122, 
-	123, 34, 92, 125, 34, 92, 125, 34, 
-	92, 32, 43, 45, 46, 61, 9, 10, 
-	60, 62, 32, 95, 9, 10, 65, 90, 
-	97, 122, 32, 95, 9, 10, 65, 90, 
-	97, 122, 32, 43, 45, 46, 61, 95, 
-	9, 10, 60, 62, 65, 90, 97, 122, 
-	32, 34, 35, 39, 40, 45, 61, 95, 
-	9, 10, 48, 57, 65, 90, 97, 122, 
-	39, 92, 32, 41, 9, 10, 32, 43, 
-	45, 61, 9, 10, 60, 62, 110, 100, 
-	32, 9, 10, 32, 34, 35, 39, 40, 
-	45, 95, 9, 10, 48, 57, 65, 90, 
-	97, 122, 48, 57, 32, 43, 45, 46, 
-	61, 9, 10, 48, 57, 60, 62, 48, 
-	57, 32, 43, 45, 61, 9, 10, 48, 
-	57, 60, 62, 32, 43, 45, 46, 61, 
+	10, 32, 34, 35, 39, 40, 45, 58, 
+	95, 9, 10, 48, 57, 65, 90, 97, 
+	122, 48, 57, 32, 43, 45, 46, 61, 
+	9, 10, 48, 57, 60, 62, 48, 57, 
+	32, 43, 45, 61, 9, 10, 48, 57, 
+	60, 62, 32, 43, 45, 46, 58, 61, 
 	95, 9, 10, 60, 62, 65, 90, 97, 
 	122, 97, 121, 32, 43, 45, 61, 115, 
 	9, 10, 60, 62, 113, 32, 9, 10, 
@@ -371,72 +293,159 @@ static const char _querybuilder_trans_keys[] = {
 	110, 116, 104, 101, 111, 116, 32, 9, 
 	10, 32, 108, 9, 10, 105, 107, 102, 
 	114, 32, 100, 9, 10, 101, 99, 111, 
-	110, 100, 101, 104, 101, 107, 101, 97, 
-	97, 32, 43, 45, 46, 61, 95, 9, 
+	110, 100, 101, 104, 101, 107, 101, 114, 
+	101, 32, 9, 10, 32, 34, 35, 39, 
+	40, 45, 58, 95, 9, 10, 48, 57, 
+	65, 90, 97, 122, 34, 92, 32, 43, 
+	45, 61, 9, 10, 60, 62, 32, 34, 
+	35, 39, 40, 45, 58, 95, 9, 10, 
+	48, 57, 65, 90, 97, 122, 123, 34, 
+	92, 125, 34, 92, 125, 34, 92, 32, 
+	43, 45, 46, 61, 9, 10, 60, 62, 
+	32, 58, 95, 9, 10, 65, 90, 97, 
+	122, 32, 58, 95, 9, 10, 65, 90, 
+	97, 122, 32, 43, 45, 46, 58, 61, 
+	95, 9, 10, 60, 62, 65, 90, 97, 
+	122, 32, 34, 35, 39, 40, 45, 58, 
+	61, 95, 9, 10, 48, 57, 65, 90, 
+	97, 122, 39, 92, 32, 41, 9, 10, 
+	32, 43, 45, 61, 9, 10, 60, 62, 
+	110, 100, 32, 9, 10, 32, 34, 35, 
+	39, 40, 45, 58, 95, 9, 10, 48, 
+	57, 65, 90, 97, 122, 48, 57, 32, 
+	43, 45, 46, 61, 9, 10, 48, 57, 
+	60, 62, 48, 57, 32, 43, 45, 61, 
+	9, 10, 48, 57, 60, 62, 32, 43, 
+	45, 46, 58, 61, 95, 9, 10, 60, 
+	62, 65, 90, 97, 122, 97, 121, 32, 
+	43, 45, 61, 115, 9, 10, 60, 62, 
+	113, 32, 9, 10, 101, 114, 116, 111, 
+	117, 114, 110, 115, 32, 9, 10, 32, 
+	78, 110, 9, 10, 85, 76, 76, 32, 
+	43, 45, 61, 9, 10, 60, 62, 111, 
+	117, 116, 32, 9, 10, 32, 78, 110, 
+	9, 10, 108, 108, 101, 105, 116, 107, 
+	109, 101, 97, 105, 111, 116, 99, 104, 
+	110, 117, 116, 101, 110, 116, 104, 101, 
+	111, 116, 32, 9, 10, 32, 108, 9, 
+	10, 105, 107, 102, 114, 32, 100, 9, 
+	10, 101, 99, 111, 110, 100, 101, 104, 
+	101, 107, 101, 97, 97, 32, 43, 45, 
+	46, 58, 61, 95, 9, 10, 60, 62, 
+	65, 90, 97, 122, 101, 101, 97, 97, 
+	32, 43, 45, 46, 58, 61, 95, 9, 
 	10, 60, 62, 65, 90, 97, 122, 101, 
-	32, 34, 35, 39, 40, 45, 95, 9, 
-	10, 48, 57, 65, 90, 97, 122, 34, 
-	92, 32, 41, 43, 45, 61, 9, 10, 
-	60, 62, 32, 41, 43, 45, 61, 97, 
-	100, 101, 103, 104, 105, 108, 109, 110, 
-	111, 115, 119, 121, 9, 10, 60, 62, 
-	32, 34, 35, 39, 40, 45, 95, 9, 
+	32, 58, 95, 9, 10, 65, 90, 97, 
+	122, 104, 114, 111, 109, 32, 40, 58, 
+	95, 9, 10, 65, 90, 97, 122, 32, 
+	58, 95, 9, 10, 65, 90, 97, 122, 
+	110, 32, 9, 10, 32, 58, 95, 9, 
+	10, 65, 90, 97, 122, 32, 58, 95, 
+	9, 10, 65, 90, 97, 122, 104, 101, 
+	114, 101, 32, 9, 10, 32, 34, 35, 
+	39, 40, 45, 58, 95, 9, 10, 48, 
+	57, 65, 90, 97, 122, 34, 92, 32, 
+	43, 45, 61, 9, 10, 60, 62, 32, 
+	34, 35, 39, 40, 45, 58, 95, 9, 
 	10, 48, 57, 65, 90, 97, 122, 123, 
 	34, 92, 125, 34, 92, 125, 34, 92, 
-	32, 41, 43, 45, 46, 61, 9, 10, 
-	60, 62, 32, 95, 9, 10, 65, 90, 
-	97, 122, 32, 95, 9, 10, 65, 90, 
-	97, 122, 32, 41, 43, 45, 46, 61, 
-	95, 9, 10, 60, 62, 65, 90, 97, 
-	122, 32, 34, 35, 39, 40, 45, 61, 
-	95, 9, 10, 48, 57, 65, 90, 97, 
-	122, 39, 92, 32, 41, 9, 10, 32, 
-	41, 43, 45, 61, 9, 10, 60, 62, 
-	32, 41, 43, 45, 61, 97, 101, 103, 
-	105, 108, 109, 110, 111, 9, 10, 60, 
-	62, 110, 100, 32, 9, 10, 113, 101, 
-	116, 115, 32, 9, 10, 32, 78, 110, 
-	9, 10, 85, 76, 76, 32, 41, 43, 
-	45, 61, 9, 10, 60, 62, 111, 117, 
-	116, 32, 9, 10, 32, 78, 110, 9, 
-	10, 108, 108, 101, 105, 116, 107, 101, 
-	97, 116, 99, 104, 101, 111, 116, 32, 
-	9, 10, 32, 108, 9, 10, 105, 114, 
-	48, 57, 32, 41, 43, 45, 46, 61, 
-	9, 10, 48, 57, 60, 62, 48, 57, 
-	32, 41, 43, 45, 61, 9, 10, 48, 
-	57, 60, 62, 32, 41, 43, 45, 46, 
+	32, 43, 45, 46, 61, 9, 10, 60, 
+	62, 32, 58, 95, 9, 10, 65, 90, 
+	97, 122, 32, 58, 95, 9, 10, 65, 
+	90, 97, 122, 32, 43, 45, 46, 58, 
 	61, 95, 9, 10, 60, 62, 65, 90, 
-	97, 122, 97, 121, 32, 41, 43, 45, 
-	61, 115, 9, 10, 60, 62, 111, 117, 
-	114, 97, 105, 111, 110, 117, 116, 101, 
-	110, 116, 104, 101, 99, 111, 110, 100, 
-	101, 101, 107, 101, 97, 32, 40, 95, 
+	97, 122, 32, 34, 35, 39, 40, 45, 
+	58, 61, 95, 9, 10, 48, 57, 65, 
+	90, 97, 122, 39, 92, 32, 41, 9, 
+	10, 32, 43, 45, 61, 9, 10, 60, 
+	62, 110, 100, 32, 9, 10, 32, 34, 
+	35, 39, 40, 45, 58, 95, 9, 10, 
+	48, 57, 65, 90, 97, 122, 48, 57, 
+	32, 43, 45, 46, 61, 9, 10, 48, 
+	57, 60, 62, 48, 57, 32, 43, 45, 
+	61, 9, 10, 48, 57, 60, 62, 32, 
+	43, 45, 46, 58, 61, 95, 9, 10, 
+	60, 62, 65, 90, 97, 122, 97, 121, 
+	32, 43, 45, 61, 115, 9, 10, 60, 
+	62, 113, 32, 9, 10, 101, 114, 116, 
+	111, 117, 114, 110, 115, 32, 9, 10, 
+	32, 78, 110, 9, 10, 85, 76, 76, 
+	32, 43, 45, 61, 9, 10, 60, 62, 
+	111, 117, 116, 32, 9, 10, 32, 78, 
+	110, 9, 10, 108, 108, 101, 105, 116, 
+	107, 109, 101, 97, 105, 111, 116, 99, 
+	104, 110, 117, 116, 101, 110, 116, 104, 
+	101, 111, 116, 32, 9, 10, 32, 108, 
+	9, 10, 105, 107, 102, 114, 32, 100, 
+	9, 10, 101, 99, 111, 110, 100, 101, 
+	104, 101, 107, 101, 97, 97, 32, 43, 
+	45, 46, 58, 61, 95, 9, 10, 60, 
+	62, 65, 90, 97, 122, 101, 32, 34, 
+	35, 39, 40, 45, 58, 95, 9, 10, 
+	48, 57, 65, 90, 97, 122, 34, 92, 
+	32, 41, 43, 45, 61, 9, 10, 60, 
+	62, 32, 41, 43, 45, 61, 97, 100, 
+	101, 103, 104, 105, 108, 109, 110, 111, 
+	115, 119, 121, 9, 10, 60, 62, 32, 
+	34, 35, 39, 40, 45, 58, 95, 9, 
+	10, 48, 57, 65, 90, 97, 122, 123, 
+	34, 92, 125, 34, 92, 125, 34, 92, 
+	32, 41, 43, 45, 46, 61, 9, 10, 
+	60, 62, 32, 58, 95, 9, 10, 65, 
+	90, 97, 122, 32, 58, 95, 9, 10, 
+	65, 90, 97, 122, 32, 41, 43, 45, 
+	46, 58, 61, 95, 9, 10, 60, 62, 
+	65, 90, 97, 122, 32, 34, 35, 39, 
+	40, 45, 58, 61, 95, 9, 10, 48, 
+	57, 65, 90, 97, 122, 39, 92, 32, 
+	41, 9, 10, 32, 41, 43, 45, 61, 
+	9, 10, 60, 62, 32, 41, 43, 45, 
+	61, 97, 101, 103, 105, 108, 109, 110, 
+	111, 9, 10, 60, 62, 110, 100, 32, 
+	9, 10, 113, 101, 116, 115, 32, 9, 
+	10, 32, 78, 110, 9, 10, 85, 76, 
+	76, 32, 41, 43, 45, 61, 9, 10, 
+	60, 62, 111, 117, 116, 32, 9, 10, 
+	32, 78, 110, 9, 10, 108, 108, 101, 
+	105, 116, 107, 101, 97, 116, 99, 104, 
+	101, 111, 116, 32, 9, 10, 32, 108, 
+	9, 10, 105, 114, 48, 57, 32, 41, 
+	43, 45, 46, 61, 9, 10, 48, 57, 
+	60, 62, 48, 57, 32, 41, 43, 45, 
+	61, 9, 10, 48, 57, 60, 62, 32, 
+	41, 43, 45, 46, 58, 61, 95, 9, 
+	10, 60, 62, 65, 90, 97, 122, 97, 
+	121, 32, 41, 43, 45, 61, 115, 9, 
+	10, 60, 62, 111, 117, 114, 97, 105, 
+	111, 110, 117, 116, 101, 110, 116, 104, 
+	101, 99, 111, 110, 100, 101, 101, 107, 
+	101, 97, 32, 40, 58, 95, 9, 10, 
+	65, 90, 97, 122, 32, 41, 9, 10, 
+	32, 41, 9, 10, 32, 41, 102, 9, 
+	10, 114, 111, 109, 32, 40, 58, 95, 
 	9, 10, 65, 90, 97, 122, 32, 41, 
-	9, 10, 32, 41, 9, 10, 32, 41, 
-	102, 9, 10, 114, 111, 109, 32, 40, 
-	95, 9, 10, 65, 90, 97, 122, 32, 
-	41, 95, 9, 10, 65, 90, 97, 122, 
+	58, 95, 9, 10, 65, 90, 97, 122, 
 	32, 41, 102, 105, 119, 9, 10, 110, 
-	32, 9, 10, 32, 95, 9, 10, 65, 
-	90, 97, 122, 32, 41, 95, 9, 10, 
-	65, 90, 97, 122, 104, 101, 114, 101, 
-	32, 9, 10, 32, 34, 35, 39, 40, 
-	45, 95, 9, 10, 48, 57, 65, 90, 
-	97, 122, 34, 92, 32, 41, 43, 45, 
-	61, 9, 10, 60, 62, 32, 41, 43, 
-	45, 61, 97, 100, 101, 102, 103, 104, 
-	105, 108, 109, 110, 111, 115, 119, 121, 
-	9, 10, 60, 62, 32, 34, 35, 39, 
-	40, 45, 95, 9, 10, 48, 57, 65, 
-	90, 97, 122, 123, 34, 92, 125, 34, 
-	92, 125, 34, 92, 32, 41, 43, 45, 
-	46, 61, 9, 10, 60, 62, 32, 95, 
-	9, 10, 65, 90, 97, 122, 32, 95, 
-	9, 10, 65, 90, 97, 122, 32, 41, 
-	43, 45, 46, 61, 95, 9, 10, 60, 
-	62, 65, 90, 97, 122, 32, 34, 35, 
-	39, 40, 45, 61, 95, 9, 10, 48, 
+	32, 9, 10, 32, 58, 95, 9, 10, 
+	65, 90, 97, 122, 32, 41, 58, 95, 
+	9, 10, 65, 90, 97, 122, 104, 101, 
+	114, 101, 32, 9, 10, 32, 34, 35, 
+	39, 40, 45, 58, 95, 9, 10, 48, 
+	57, 65, 90, 97, 122, 34, 92, 32, 
+	41, 43, 45, 61, 9, 10, 60, 62, 
+	32, 41, 43, 45, 61, 97, 100, 101, 
+	102, 103, 104, 105, 108, 109, 110, 111, 
+	115, 119, 121, 9, 10, 60, 62, 32, 
+	34, 35, 39, 40, 45, 58, 95, 9, 
+	10, 48, 57, 65, 90, 97, 122, 123, 
+	34, 92, 125, 34, 92, 125, 34, 92, 
+	32, 41, 43, 45, 46, 61, 9, 10, 
+	60, 62, 32, 58, 95, 9, 10, 65, 
+	90, 97, 122, 32, 58, 95, 9, 10, 
+	65, 90, 97, 122, 32, 41, 43, 45, 
+	46, 58, 61, 95, 9, 10, 60, 62, 
+	65, 90, 97, 122, 32, 34, 35, 39, 
+	40, 45, 58, 61, 95, 9, 10, 48, 
 	57, 65, 90, 97, 122, 39, 92, 32, 
 	41, 9, 10, 32, 41, 43, 45, 61, 
 	9, 10, 60, 62, 32, 41, 43, 45, 
@@ -453,118 +462,118 @@ static const char _querybuilder_trans_keys[] = {
 	32, 41, 43, 45, 46, 61, 9, 10, 
 	48, 57, 60, 62, 48, 57, 32, 41, 
 	43, 45, 61, 9, 10, 48, 57, 60, 
-	62, 32, 41, 43, 45, 46, 61, 95, 
-	9, 10, 60, 62, 65, 90, 97, 122, 
-	97, 121, 32, 41, 43, 45, 61, 115, 
-	9, 10, 60, 62, 111, 117, 114, 97, 
-	105, 111, 110, 117, 116, 101, 110, 116, 
-	104, 101, 99, 111, 110, 100, 101, 101, 
-	107, 101, 97, 32, 97, 102, 103, 108, 
-	111, 112, 9, 10, 32, 97, 102, 103, 
+	62, 32, 41, 43, 45, 46, 58, 61, 
+	95, 9, 10, 60, 62, 65, 90, 97, 
+	122, 97, 121, 32, 41, 43, 45, 61, 
+	115, 9, 10, 60, 62, 111, 117, 114, 
+	97, 105, 111, 110, 117, 116, 101, 110, 
+	116, 104, 101, 99, 111, 110, 100, 101, 
+	101, 107, 101, 97, 32, 97, 102, 103, 
 	108, 111, 112, 9, 10, 32, 97, 102, 
-	103, 105, 108, 111, 112, 119, 9, 10, 
-	32, 44, 108, 111, 112, 9, 10, 32, 
-	44, 111, 112, 9, 10, 32, 111, 112, 
-	9, 10, 32, 112, 9, 10, 32, 9, 
-	10, 32, 44, 65, 68, 97, 100, 108, 
-	111, 112, 9, 10, 32, 44, 108, 111, 
-	112, 9, 10, 32, 43, 45, 61, 97, 
-	100, 101, 102, 103, 104, 105, 108, 109, 
-	110, 111, 112, 115, 119, 121, 9, 10, 
-	60, 62, 32, 43, 45, 61, 97, 101, 
-	102, 103, 105, 108, 109, 110, 111, 112, 
-	9, 10, 60, 62, 32, 43, 45, 61, 
+	103, 108, 111, 112, 9, 10, 32, 97, 
+	102, 103, 105, 108, 111, 112, 119, 9, 
+	10, 32, 44, 108, 111, 112, 9, 10, 
+	32, 44, 111, 112, 9, 10, 32, 111, 
+	112, 9, 10, 32, 112, 9, 10, 32, 
+	9, 10, 32, 44, 65, 68, 97, 100, 
+	108, 111, 112, 9, 10, 32, 44, 108, 
+	111, 112, 9, 10, 32, 43, 45, 61, 
 	97, 100, 101, 102, 103, 104, 105, 108, 
 	109, 110, 111, 112, 115, 119, 121, 9, 
 	10, 60, 62, 32, 43, 45, 61, 97, 
-	100, 101, 102, 103, 104, 105, 108, 109, 
-	110, 111, 112, 115, 119, 121, 9, 10, 
-	60, 62, 32, 43, 45, 61, 97, 101, 
-	102, 103, 105, 108, 109, 110, 111, 112, 
+	101, 102, 103, 105, 108, 109, 110, 111, 
+	112, 9, 10, 60, 62, 32, 43, 45, 
+	61, 97, 100, 101, 102, 103, 104, 105, 
+	108, 109, 110, 111, 112, 115, 119, 121, 
 	9, 10, 60, 62, 32, 43, 45, 61, 
 	97, 100, 101, 102, 103, 104, 105, 108, 
 	109, 110, 111, 112, 115, 119, 121, 9, 
-	10, 60, 62, 32, 97, 102, 103, 105, 
-	108, 111, 112, 119, 9, 10, 32, 97, 
-	102, 103, 105, 108, 111, 112, 119, 9, 
-	10, 32, 43, 45, 61, 97, 100, 101, 
-	102, 103, 104, 105, 108, 109, 110, 111, 
-	112, 115, 119, 121, 9, 10, 60, 62, 
-	32, 43, 45, 61, 97, 101, 102, 103, 
-	105, 108, 109, 110, 111, 112, 9, 10, 
-	60, 62, 32, 43, 45, 61, 97, 100, 
+	10, 60, 62, 32, 43, 45, 61, 97, 
+	101, 102, 103, 105, 108, 109, 110, 111, 
+	112, 9, 10, 60, 62, 32, 43, 45, 
+	61, 97, 100, 101, 102, 103, 104, 105, 
+	108, 109, 110, 111, 112, 115, 119, 121, 
+	9, 10, 60, 62, 32, 97, 102, 103, 
+	105, 108, 111, 112, 119, 9, 10, 32, 
+	97, 102, 103, 105, 108, 111, 112, 119, 
+	9, 10, 32, 43, 45, 61, 97, 100, 
 	101, 102, 103, 104, 105, 108, 109, 110, 
 	111, 112, 115, 119, 121, 9, 10, 60, 
-	62, 0
+	62, 32, 43, 45, 61, 97, 101, 102, 
+	103, 105, 108, 109, 110, 111, 112, 9, 
+	10, 60, 62, 32, 43, 45, 61, 97, 
+	100, 101, 102, 103, 104, 105, 108, 109, 
+	110, 111, 112, 115, 119, 121, 9, 10, 
+	60, 62, 0
 };
 
 static const char _querybuilder_single_lengths[] = {
-	0, 3, 2, 1, 1, 1, 1, 3, 
-	2, 1, 1, 1, 1, 3, 3, 2, 
-	1, 1, 1, 1, 1, 2, 1, 2, 
-	2, 4, 1, 1, 1, 1, 2, 2, 
+	0, 4, 2, 1, 1, 1, 1, 4, 
+	2, 1, 1, 1, 1, 4, 4, 3, 
+	1, 1, 1, 1, 1, 2, 1, 3, 
+	3, 5, 1, 1, 1, 1, 2, 2, 
 	0, 2, 2, 0, 1, 1, 1, 1, 
 	1, 1, 2, 2, 0, 1, 1, 1, 
-	1, 1, 1, 1, 1, 2, 2, 2, 
-	2, 1, 1, 1, 1, 2, 1, 2, 
-	2, 4, 1, 1, 2, 1, 1, 1, 
-	1, 2, 2, 4, 2, 2, 4, 1, 
-	1, 2, 2, 2, 2, 1, 1, 1, 
-	1, 1, 7, 2, 4, 7, 1, 3, 
-	3, 2, 0, 0, 5, 2, 2, 6, 
-	8, 2, 0, 2, 4, 1, 1, 1, 
-	7, 0, 5, 0, 4, 6, 1, 1, 
+	1, 1, 1, 1, 1, 3, 3, 3, 
+	2, 1, 1, 1, 1, 2, 1, 3, 
+	3, 5, 1, 1, 2, 1, 1, 1, 
+	1, 3, 3, 5, 3, 3, 5, 1, 
+	1, 3, 3, 2, 2, 1, 1, 1, 
+	1, 1, 8, 2, 4, 8, 1, 3, 
+	3, 2, 0, 0, 5, 3, 3, 7, 
+	9, 2, 0, 2, 4, 1, 1, 1, 
+	8, 0, 5, 0, 4, 7, 1, 1, 
 	5, 1, 1, 3, 1, 1, 1, 2, 
 	1, 3, 1, 1, 1, 4, 2, 1, 
 	1, 3, 1, 1, 3, 2, 1, 3, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 2, 1, 1, 2, 1, 1, 
 	2, 2, 1, 1, 1, 1, 1, 2, 
-	1, 1, 1, 1, 1, 1, 7, 2, 
-	4, 7, 1, 3, 3, 2, 0, 0, 
-	5, 2, 2, 6, 8, 2, 0, 2, 
-	4, 1, 1, 1, 7, 0, 5, 0, 
-	4, 6, 1, 1, 5, 1, 1, 3, 
+	1, 1, 1, 1, 1, 1, 8, 2, 
+	4, 8, 1, 3, 3, 2, 0, 0, 
+	5, 3, 3, 7, 9, 2, 0, 2, 
+	4, 1, 1, 1, 8, 0, 5, 0, 
+	4, 7, 1, 1, 5, 1, 1, 3, 
 	1, 1, 1, 2, 1, 3, 1, 1, 
 	1, 4, 2, 1, 1, 3, 1, 1, 
 	3, 2, 1, 3, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 2, 1, 
 	1, 2, 1, 1, 2, 2, 1, 1, 
 	1, 1, 1, 2, 1, 1, 1, 1, 
-	1, 6, 1, 0, 1, 1, 1, 6, 
-	1, 0, 2, 1, 1, 1, 1, 3, 
-	2, 1, 1, 2, 2, 1, 1, 1, 
-	1, 1, 7, 2, 4, 7, 1, 3, 
-	3, 2, 0, 0, 5, 2, 2, 6, 
-	8, 2, 0, 2, 4, 1, 1, 1, 
-	7, 0, 5, 0, 4, 6, 1, 1, 
+	1, 7, 1, 0, 1, 1, 1, 7, 
+	1, 0, 3, 1, 1, 1, 1, 4, 
+	3, 1, 1, 3, 3, 1, 1, 1, 
+	1, 1, 8, 2, 4, 8, 1, 3, 
+	3, 2, 0, 0, 5, 3, 3, 7, 
+	9, 2, 0, 2, 4, 1, 1, 1, 
+	8, 0, 5, 0, 4, 7, 1, 1, 
 	5, 1, 1, 3, 1, 1, 1, 2, 
 	1, 3, 1, 1, 1, 4, 2, 1, 
 	1, 3, 1, 1, 3, 2, 1, 3, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 2, 1, 1, 2, 1, 1, 
 	2, 2, 1, 1, 1, 1, 1, 2, 
-	1, 1, 1, 1, 1, 6, 1, 0, 
-	7, 2, 5, 18, 7, 1, 3, 3, 
-	2, 0, 0, 6, 2, 2, 7, 8, 
+	1, 1, 1, 1, 1, 7, 1, 0, 
+	8, 2, 5, 18, 8, 1, 3, 3, 
+	2, 0, 0, 6, 3, 3, 8, 9, 
 	2, 0, 2, 5, 13, 1, 1, 1, 
 	1, 2, 1, 1, 3, 1, 1, 1, 
 	5, 2, 1, 1, 3, 1, 1, 3, 
 	1, 1, 1, 1, 1, 1, 2, 1, 
 	1, 2, 1, 1, 0, 6, 0, 5, 
-	7, 1, 1, 6, 1, 1, 1, 3, 
+	8, 1, 1, 6, 1, 1, 1, 3, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 0, 3, 2, 2, 3, 1, 1, 
-	1, 3, 3, 5, 1, 1, 2, 3, 
-	1, 1, 1, 1, 1, 7, 2, 5, 
-	19, 7, 1, 3, 3, 2, 0, 0, 
-	6, 2, 2, 7, 8, 2, 0, 2, 
+	1, 0, 4, 2, 2, 3, 1, 1, 
+	1, 4, 4, 5, 1, 1, 3, 4, 
+	1, 1, 1, 1, 1, 8, 2, 5, 
+	19, 8, 1, 3, 3, 2, 0, 0, 
+	6, 3, 3, 8, 9, 2, 0, 2, 
 	5, 14, 1, 1, 1, 1, 2, 2, 
 	1, 3, 1, 1, 1, 5, 2, 1, 
 	1, 3, 1, 1, 3, 1, 1, 1, 
 	1, 1, 1, 2, 1, 1, 2, 1, 
-	1, 0, 6, 0, 5, 7, 1, 1, 
+	1, 0, 6, 0, 5, 8, 1, 1, 
 	6, 1, 1, 1, 3, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 0, 7, 
@@ -649,93 +658,94 @@ static const char _querybuilder_range_lengths[] = {
 };
 
 static const short _querybuilder_index_offsets[] = {
-	0, 0, 7, 11, 14, 16, 18, 21, 
-	28, 32, 35, 37, 39, 41, 48, 55, 
-	61, 63, 65, 67, 69, 72, 76, 78, 
-	84, 90, 98, 100, 102, 104, 106, 111, 
-	116, 118, 123, 128, 130, 134, 136, 138, 
-	140, 142, 144, 149, 154, 156, 160, 162, 
-	164, 166, 168, 170, 172, 174, 180, 186, 
-	192, 195, 197, 199, 201, 204, 208, 210, 
-	216, 222, 230, 232, 234, 238, 240, 242, 
-	244, 246, 252, 258, 266, 272, 278, 286, 
-	288, 291, 297, 303, 306, 310, 312, 314, 
-	316, 318, 321, 333, 336, 343, 355, 357, 
-	361, 365, 368, 369, 370, 378, 384, 390, 
-	401, 414, 417, 418, 422, 429, 431, 433, 
-	436, 448, 450, 459, 461, 469, 480, 482, 
-	484, 492, 494, 497, 501, 503, 505, 507, 
-	510, 513, 518, 520, 522, 524, 531, 534, 
-	536, 539, 544, 546, 548, 552, 555, 557, 
-	561, 563, 565, 567, 569, 571, 573, 575, 
-	577, 579, 581, 584, 586, 589, 593, 595, 
-	597, 600, 604, 606, 608, 610, 612, 614, 
-	617, 619, 621, 623, 625, 627, 630, 642, 
-	645, 652, 664, 666, 670, 674, 677, 678, 
-	679, 687, 693, 699, 710, 723, 726, 727, 
-	731, 738, 740, 742, 745, 757, 759, 768, 
-	770, 778, 789, 791, 793, 801, 803, 806, 
-	810, 812, 814, 816, 819, 822, 827, 829, 
-	831, 833, 840, 843, 845, 848, 853, 855, 
-	857, 861, 864, 866, 870, 872, 874, 876, 
-	878, 880, 882, 884, 886, 888, 890, 893, 
-	895, 898, 902, 904, 906, 909, 913, 915, 
-	917, 919, 921, 923, 926, 928, 930, 932, 
-	934, 936, 947, 949, 950, 952, 954, 956, 
-	967, 969, 970, 976, 978, 980, 982, 984, 
-	991, 997, 999, 1002, 1008, 1014, 1016, 1018, 
-	1020, 1022, 1025, 1037, 1040, 1047, 1059, 1061, 
-	1065, 1069, 1072, 1073, 1074, 1082, 1088, 1094, 
-	1105, 1118, 1121, 1122, 1126, 1133, 1135, 1137, 
-	1140, 1152, 1154, 1163, 1165, 1173, 1184, 1186, 
-	1188, 1196, 1198, 1201, 1205, 1207, 1209, 1211, 
-	1214, 1217, 1222, 1224, 1226, 1228, 1235, 1238, 
-	1240, 1243, 1248, 1250, 1252, 1256, 1259, 1261, 
-	1265, 1267, 1269, 1271, 1273, 1275, 1277, 1279, 
-	1281, 1283, 1285, 1288, 1290, 1293, 1297, 1299, 
-	1301, 1304, 1308, 1310, 1312, 1314, 1316, 1318, 
-	1321, 1323, 1325, 1327, 1329, 1331, 1342, 1344, 
-	1345, 1357, 1360, 1368, 1389, 1401, 1403, 1407, 
-	1411, 1414, 1415, 1416, 1425, 1431, 1437, 1449, 
-	1462, 1465, 1466, 1470, 1478, 1494, 1496, 1498, 
-	1501, 1503, 1506, 1508, 1511, 1516, 1518, 1520, 
-	1522, 1530, 1533, 1535, 1538, 1543, 1545, 1547, 
-	1551, 1553, 1555, 1557, 1559, 1561, 1563, 1566, 
-	1568, 1571, 1575, 1577, 1579, 1581, 1591, 1593, 
-	1602, 1614, 1616, 1618, 1627, 1629, 1631, 1633, 
-	1637, 1639, 1641, 1643, 1645, 1647, 1649, 1651, 
-	1653, 1655, 1657, 1659, 1661, 1663, 1665, 1667, 
-	1669, 1671, 1672, 1679, 1683, 1687, 1692, 1694, 
-	1696, 1698, 1705, 1712, 1719, 1721, 1724, 1730, 
-	1737, 1739, 1741, 1743, 1745, 1748, 1760, 1763, 
-	1771, 1793, 1805, 1807, 1811, 1815, 1818, 1819, 
-	1820, 1829, 1835, 1841, 1853, 1866, 1869, 1870, 
-	1874, 1882, 1899, 1901, 1903, 1906, 1908, 1911, 
-	1914, 1917, 1922, 1924, 1926, 1928, 1936, 1939, 
-	1941, 1944, 1949, 1951, 1953, 1957, 1959, 1961, 
-	1963, 1965, 1967, 1969, 1972, 1974, 1977, 1981, 
-	1983, 1985, 1987, 1997, 1999, 2008, 2020, 2022, 
-	2024, 2033, 2035, 2037, 2039, 2043, 2045, 2047, 
-	2049, 2051, 2053, 2055, 2057, 2059, 2061, 2063, 
-	2065, 2067, 2069, 2071, 2073, 2075, 2077, 2078, 
-	2087, 2096, 2107, 2114, 2120, 2125, 2129, 2132, 
-	2143, 2150, 2172, 2189, 2211, 2233, 2250, 2272, 
-	2283, 2294, 2316, 2333, 2355, 2356
+	0, 0, 8, 12, 15, 17, 19, 22, 
+	30, 34, 37, 39, 41, 43, 51, 59, 
+	66, 68, 70, 72, 74, 77, 81, 83, 
+	90, 97, 106, 108, 110, 112, 114, 119, 
+	124, 126, 131, 136, 138, 142, 144, 146, 
+	148, 150, 152, 157, 162, 164, 168, 170, 
+	172, 174, 176, 178, 180, 182, 189, 196, 
+	203, 206, 208, 210, 212, 215, 219, 221, 
+	228, 235, 244, 246, 248, 252, 254, 256, 
+	258, 260, 267, 274, 283, 290, 297, 306, 
+	308, 311, 318, 325, 328, 332, 334, 336, 
+	338, 340, 343, 356, 359, 366, 379, 381, 
+	385, 389, 392, 393, 394, 402, 409, 416, 
+	428, 442, 445, 446, 450, 457, 459, 461, 
+	464, 477, 479, 488, 490, 498, 510, 512, 
+	514, 522, 524, 527, 531, 533, 535, 537, 
+	540, 543, 548, 550, 552, 554, 561, 564, 
+	566, 569, 574, 576, 578, 582, 585, 587, 
+	591, 593, 595, 597, 599, 601, 603, 605, 
+	607, 609, 611, 614, 616, 619, 623, 625, 
+	627, 630, 634, 636, 638, 640, 642, 644, 
+	647, 649, 651, 653, 655, 657, 660, 673, 
+	676, 683, 696, 698, 702, 706, 709, 710, 
+	711, 719, 726, 733, 745, 759, 762, 763, 
+	767, 774, 776, 778, 781, 794, 796, 805, 
+	807, 815, 827, 829, 831, 839, 841, 844, 
+	848, 850, 852, 854, 857, 860, 865, 867, 
+	869, 871, 878, 881, 883, 886, 891, 893, 
+	895, 899, 902, 904, 908, 910, 912, 914, 
+	916, 918, 920, 922, 924, 926, 928, 931, 
+	933, 936, 940, 942, 944, 947, 951, 953, 
+	955, 957, 959, 961, 964, 966, 968, 970, 
+	972, 974, 986, 988, 989, 991, 993, 995, 
+	1007, 1009, 1010, 1017, 1019, 1021, 1023, 1025, 
+	1033, 1040, 1042, 1045, 1052, 1059, 1061, 1063, 
+	1065, 1067, 1070, 1083, 1086, 1093, 1106, 1108, 
+	1112, 1116, 1119, 1120, 1121, 1129, 1136, 1143, 
+	1155, 1169, 1172, 1173, 1177, 1184, 1186, 1188, 
+	1191, 1204, 1206, 1215, 1217, 1225, 1237, 1239, 
+	1241, 1249, 1251, 1254, 1258, 1260, 1262, 1264, 
+	1267, 1270, 1275, 1277, 1279, 1281, 1288, 1291, 
+	1293, 1296, 1301, 1303, 1305, 1309, 1312, 1314, 
+	1318, 1320, 1322, 1324, 1326, 1328, 1330, 1332, 
+	1334, 1336, 1338, 1341, 1343, 1346, 1350, 1352, 
+	1354, 1357, 1361, 1363, 1365, 1367, 1369, 1371, 
+	1374, 1376, 1378, 1380, 1382, 1384, 1396, 1398, 
+	1399, 1412, 1415, 1423, 1444, 1457, 1459, 1463, 
+	1467, 1470, 1471, 1472, 1481, 1488, 1495, 1508, 
+	1522, 1525, 1526, 1530, 1538, 1554, 1556, 1558, 
+	1561, 1563, 1566, 1568, 1571, 1576, 1578, 1580, 
+	1582, 1590, 1593, 1595, 1598, 1603, 1605, 1607, 
+	1611, 1613, 1615, 1617, 1619, 1621, 1623, 1626, 
+	1628, 1631, 1635, 1637, 1639, 1641, 1651, 1653, 
+	1662, 1675, 1677, 1679, 1688, 1690, 1692, 1694, 
+	1698, 1700, 1702, 1704, 1706, 1708, 1710, 1712, 
+	1714, 1716, 1718, 1720, 1722, 1724, 1726, 1728, 
+	1730, 1732, 1733, 1741, 1745, 1749, 1754, 1756, 
+	1758, 1760, 1768, 1776, 1783, 1785, 1788, 1795, 
+	1803, 1805, 1807, 1809, 1811, 1814, 1827, 1830, 
+	1838, 1860, 1873, 1875, 1879, 1883, 1886, 1887, 
+	1888, 1897, 1904, 1911, 1924, 1938, 1941, 1942, 
+	1946, 1954, 1971, 1973, 1975, 1978, 1980, 1983, 
+	1986, 1989, 1994, 1996, 1998, 2000, 2008, 2011, 
+	2013, 2016, 2021, 2023, 2025, 2029, 2031, 2033, 
+	2035, 2037, 2039, 2041, 2044, 2046, 2049, 2053, 
+	2055, 2057, 2059, 2069, 2071, 2080, 2093, 2095, 
+	2097, 2106, 2108, 2110, 2112, 2116, 2118, 2120, 
+	2122, 2124, 2126, 2128, 2130, 2132, 2134, 2136, 
+	2138, 2140, 2142, 2144, 2146, 2148, 2150, 2151, 
+	2160, 2169, 2180, 2187, 2193, 2198, 2202, 2205, 
+	2216, 2223, 2245, 2262, 2284, 2306, 2323, 2345, 
+	2356, 2367, 2389, 2406, 2428, 2429
 };
 
 static const short _querybuilder_trans_targs[] = {
-	1, 2, 272, 1, 272, 272, 0, 2, 
-	3, 2, 0, 551, 551, 0, 5, 0, 
-	6, 0, 7, 7, 0, 7, 8, 266, 
-	7, 266, 266, 0, 8, 9, 8, 0, 
-	552, 552, 0, 11, 0, 12, 0, 13, 
-	0, 14, 8, 15, 14, 15, 15, 0, 
-	14, 8, 15, 14, 15, 15, 0, 553, 
-	15, 553, 15, 15, 0, 17, 0, 18, 
-	0, 19, 0, 20, 0, 21, 21, 0, 
-	21, 22, 21, 0, 23, 0, 24, 25, 
-	24, 25, 25, 0, 24, 25, 24, 25, 
-	25, 0, 554, 24, 76, 25, 554, 25, 
+	1, 2, 272, 272, 1, 272, 272, 0, 
+	2, 3, 2, 0, 551, 551, 0, 5, 
+	0, 6, 0, 7, 7, 0, 7, 8, 
+	266, 266, 7, 266, 266, 0, 8, 9, 
+	8, 0, 552, 552, 0, 11, 0, 12, 
+	0, 13, 0, 14, 8, 15, 15, 14, 
+	15, 15, 0, 14, 8, 15, 15, 14, 
+	15, 15, 0, 553, 15, 15, 553, 15, 
+	15, 0, 17, 0, 18, 0, 19, 0, 
+	20, 0, 21, 21, 0, 21, 22, 21, 
+	0, 23, 0, 24, 25, 25, 24, 25, 
+	25, 0, 24, 25, 25, 24, 25, 25, 
+	0, 554, 24, 76, 25, 25, 554, 25, 
 	25, 0, 27, 0, 28, 0, 29, 0, 
 	30, 0, 31, 32, 31, 33, 0, 31, 
 	32, 31, 33, 0, 33, 0, 555, 34, 
@@ -746,217 +756,225 @@ static const short _querybuilder_trans_targs[] = {
 	45, 0, 45, 0, 557, 557, 45, 0, 
 	47, 0, 48, 0, 49, 0, 50, 0, 
 	51, 0, 52, 0, 53, 0, 54, 55, 
-	54, 55, 55, 0, 54, 55, 54, 55, 
-	55, 0, 558, 55, 558, 55, 55, 0, 
-	38, 57, 0, 58, 0, 59, 0, 60, 
-	0, 61, 61, 0, 61, 62, 61, 0, 
-	63, 0, 64, 65, 64, 65, 65, 0, 
-	64, 65, 64, 65, 65, 0, 559, 64, 
-	73, 65, 559, 65, 65, 0, 67, 0, 
-	68, 0, 560, 64, 560, 0, 66, 0, 
-	71, 0, 68, 0, 70, 0, 74, 75, 
-	74, 75, 75, 0, 74, 75, 74, 75, 
-	75, 0, 559, 64, 73, 75, 559, 75, 
-	75, 0, 77, 78, 77, 78, 78, 0, 
-	77, 78, 77, 78, 78, 0, 554, 24, 
-	76, 78, 554, 78, 78, 0, 80, 0, 
-	81, 81, 0, 81, 82, 81, 82, 82, 
-	0, 552, 82, 552, 82, 82, 0, 38, 
-	84, 0, 7, 58, 7, 0, 86, 0, 
-	87, 0, 88, 0, 89, 0, 90, 90, 
-	0, 90, 91, 94, 105, 107, 113, 263, 
-	90, 114, 263, 263, 0, 92, 265, 91, 
-	561, 93, 93, 93, 561, 104, 0, 90, 
-	91, 94, 105, 107, 113, 263, 90, 114, 
+	55, 54, 55, 55, 0, 54, 55, 55, 
+	54, 55, 55, 0, 558, 55, 55, 558, 
+	55, 55, 0, 38, 57, 0, 58, 0, 
+	59, 0, 60, 0, 61, 61, 0, 61, 
+	62, 61, 0, 63, 0, 64, 65, 65, 
+	64, 65, 65, 0, 64, 65, 65, 64, 
+	65, 65, 0, 559, 64, 73, 65, 65, 
+	559, 65, 65, 0, 67, 0, 68, 0, 
+	560, 64, 560, 0, 66, 0, 71, 0, 
+	68, 0, 70, 0, 74, 75, 75, 74, 
+	75, 75, 0, 74, 75, 75, 74, 75, 
+	75, 0, 559, 64, 73, 75, 75, 559, 
+	75, 75, 0, 77, 78, 78, 77, 78, 
+	78, 0, 77, 78, 78, 77, 78, 78, 
+	0, 554, 24, 76, 78, 78, 554, 78, 
+	78, 0, 80, 0, 81, 81, 0, 81, 
+	82, 82, 81, 82, 82, 0, 552, 82, 
+	82, 552, 82, 82, 0, 38, 84, 0, 
+	7, 58, 7, 0, 86, 0, 87, 0, 
+	88, 0, 89, 0, 90, 90, 0, 90, 
+	91, 94, 105, 107, 113, 263, 263, 90, 
+	114, 263, 263, 0, 92, 265, 91, 561, 
+	93, 93, 93, 561, 104, 0, 90, 91, 
+	94, 105, 107, 113, 263, 263, 90, 114, 
 	263, 263, 0, 95, 0, 97, 99, 0, 
 	96, 97, 99, 100, 96, 96, 98, 97, 
 	97, 96, 561, 93, 93, 101, 93, 561, 
-	104, 0, 102, 103, 102, 103, 103, 0, 
-	102, 103, 102, 103, 103, 0, 561, 93, 
-	93, 101, 93, 103, 561, 104, 103, 103, 
-	0, 90, 91, 94, 105, 107, 113, 93, 
-	263, 90, 114, 263, 263, 0, 92, 106, 
-	105, 105, 107, 108, 107, 0, 562, 93, 
-	93, 93, 562, 104, 0, 110, 0, 111, 
-	0, 112, 112, 0, 112, 91, 94, 105, 
-	107, 113, 117, 112, 114, 117, 117, 0, 
-	114, 0, 561, 93, 93, 115, 93, 561, 
-	114, 104, 0, 116, 0, 561, 93, 93, 
-	93, 561, 116, 104, 0, 563, 93, 93, 
-	101, 93, 117, 563, 104, 117, 117, 0, 
-	119, 0, 120, 0, 562, 93, 93, 93, 
-	108, 562, 104, 0, 122, 0, 90, 90, 
-	0, 122, 17, 122, 0, 125, 0, 126, 
-	0, 120, 0, 80, 128, 0, 129, 129, 
-	0, 129, 130, 134, 129, 0, 131, 0, 
-	132, 0, 133, 0, 562, 93, 93, 93, 
-	562, 104, 0, 135, 138, 0, 136, 0, 
-	137, 137, 0, 137, 130, 134, 137, 0, 
-	139, 0, 133, 0, 122, 141, 122, 0, 
-	142, 28, 0, 122, 0, 144, 147, 151, 
-	0, 145, 0, 146, 0, 122, 0, 148, 
-	0, 149, 0, 150, 0, 120, 0, 152, 
-	0, 153, 0, 120, 0, 122, 155, 0, 
-	156, 0, 157, 157, 0, 157, 158, 157, 
-	0, 159, 0, 142, 0, 38, 161, 0, 
-	112, 58, 112, 0, 163, 0, 164, 0, 
-	165, 0, 166, 0, 120, 0, 168, 170, 
-	0, 169, 0, 120, 0, 171, 0, 172, 
-	0, 173, 0, 174, 174, 0, 174, 175, 
-	178, 189, 191, 197, 257, 174, 198, 257, 
-	257, 0, 176, 259, 175, 564, 177, 177, 
-	177, 564, 188, 0, 174, 175, 178, 189, 
-	191, 197, 257, 174, 198, 257, 257, 0, 
+	104, 0, 102, 103, 103, 102, 103, 103, 
+	0, 102, 103, 103, 102, 103, 103, 0, 
+	561, 93, 93, 101, 103, 93, 103, 561, 
+	104, 103, 103, 0, 90, 91, 94, 105, 
+	107, 113, 263, 93, 263, 90, 114, 263, 
+	263, 0, 92, 106, 105, 105, 107, 108, 
+	107, 0, 562, 93, 93, 93, 562, 104, 
+	0, 110, 0, 111, 0, 112, 112, 0, 
+	112, 91, 94, 105, 107, 113, 117, 117, 
+	112, 114, 117, 117, 0, 114, 0, 561, 
+	93, 93, 115, 93, 561, 114, 104, 0, 
+	116, 0, 561, 93, 93, 93, 561, 116, 
+	104, 0, 563, 93, 93, 101, 117, 93, 
+	117, 563, 104, 117, 117, 0, 119, 0, 
+	120, 0, 562, 93, 93, 93, 108, 562, 
+	104, 0, 122, 0, 90, 90, 0, 122, 
+	17, 122, 0, 125, 0, 126, 0, 120, 
+	0, 80, 128, 0, 129, 129, 0, 129, 
+	130, 134, 129, 0, 131, 0, 132, 0, 
+	133, 0, 562, 93, 93, 93, 562, 104, 
+	0, 135, 138, 0, 136, 0, 137, 137, 
+	0, 137, 130, 134, 137, 0, 139, 0, 
+	133, 0, 122, 141, 122, 0, 142, 28, 
+	0, 122, 0, 144, 147, 151, 0, 145, 
+	0, 146, 0, 122, 0, 148, 0, 149, 
+	0, 150, 0, 120, 0, 152, 0, 153, 
+	0, 120, 0, 122, 155, 0, 156, 0, 
+	157, 157, 0, 157, 158, 157, 0, 159, 
+	0, 142, 0, 38, 161, 0, 112, 58, 
+	112, 0, 163, 0, 164, 0, 165, 0, 
+	166, 0, 120, 0, 168, 170, 0, 169, 
+	0, 120, 0, 171, 0, 172, 0, 173, 
+	0, 174, 174, 0, 174, 175, 178, 189, 
+	191, 197, 257, 257, 174, 198, 257, 257, 
+	0, 176, 259, 175, 564, 177, 177, 177, 
+	564, 188, 0, 174, 175, 178, 189, 191, 
+	197, 257, 257, 174, 198, 257, 257, 0, 
 	179, 0, 181, 183, 0, 180, 181, 183, 
 	184, 180, 180, 182, 181, 181, 180, 564, 
 	177, 177, 185, 177, 564, 188, 0, 186, 
-	187, 186, 187, 187, 0, 186, 187, 186, 
-	187, 187, 0, 564, 177, 177, 185, 177, 
-	187, 564, 188, 187, 187, 0, 174, 175, 
-	178, 189, 191, 197, 177, 257, 174, 198, 
-	257, 257, 0, 176, 190, 189, 189, 191, 
-	192, 191, 0, 565, 177, 177, 177, 565, 
-	188, 0, 194, 0, 195, 0, 196, 196, 
-	0, 196, 175, 178, 189, 191, 197, 201, 
-	196, 198, 201, 201, 0, 198, 0, 564, 
-	177, 177, 199, 177, 564, 198, 188, 0, 
-	200, 0, 564, 177, 177, 177, 564, 200, 
-	188, 0, 566, 177, 177, 185, 177, 201, 
-	566, 188, 201, 201, 0, 203, 0, 204, 
-	0, 565, 177, 177, 177, 192, 565, 188, 
-	0, 206, 0, 174, 174, 0, 206, 17, 
-	206, 0, 209, 0, 210, 0, 204, 0, 
-	80, 212, 0, 213, 213, 0, 213, 214, 
-	218, 213, 0, 215, 0, 216, 0, 217, 
-	0, 565, 177, 177, 177, 565, 188, 0, 
-	219, 222, 0, 220, 0, 221, 221, 0, 
-	221, 214, 218, 221, 0, 223, 0, 217, 
-	0, 206, 225, 206, 0, 226, 28, 0, 
-	206, 0, 228, 231, 235, 0, 229, 0, 
-	230, 0, 206, 0, 232, 0, 233, 0, 
-	234, 0, 204, 0, 236, 0, 237, 0, 
-	204, 0, 206, 239, 0, 240, 0, 241, 
-	241, 0, 241, 242, 241, 0, 243, 0, 
-	226, 0, 38, 245, 0, 196, 58, 196, 
-	0, 247, 0, 248, 0, 249, 0, 250, 
-	0, 204, 0, 252, 170, 0, 253, 0, 
-	204, 0, 255, 0, 210, 0, 228, 0, 
-	564, 177, 177, 185, 177, 257, 564, 188, 
-	257, 257, 0, 252, 0, 175, 261, 0, 
-	126, 0, 144, 0, 561, 93, 93, 101, 
+	187, 187, 186, 187, 187, 0, 186, 187, 
+	187, 186, 187, 187, 0, 564, 177, 177, 
+	185, 187, 177, 187, 564, 188, 187, 187, 
+	0, 174, 175, 178, 189, 191, 197, 257, 
+	177, 257, 174, 198, 257, 257, 0, 176, 
+	190, 189, 189, 191, 192, 191, 0, 565, 
+	177, 177, 177, 565, 188, 0, 194, 0, 
+	195, 0, 196, 196, 0, 196, 175, 178, 
+	189, 191, 197, 201, 201, 196, 198, 201, 
+	201, 0, 198, 0, 564, 177, 177, 199, 
+	177, 564, 198, 188, 0, 200, 0, 564, 
+	177, 177, 177, 564, 200, 188, 0, 566, 
+	177, 177, 185, 201, 177, 201, 566, 188, 
+	201, 201, 0, 203, 0, 204, 0, 565, 
+	177, 177, 177, 192, 565, 188, 0, 206, 
+	0, 174, 174, 0, 206, 17, 206, 0, 
+	209, 0, 210, 0, 204, 0, 80, 212, 
+	0, 213, 213, 0, 213, 214, 218, 213, 
+	0, 215, 0, 216, 0, 217, 0, 565, 
+	177, 177, 177, 565, 188, 0, 219, 222, 
+	0, 220, 0, 221, 221, 0, 221, 214, 
+	218, 221, 0, 223, 0, 217, 0, 206, 
+	225, 206, 0, 226, 28, 0, 206, 0, 
+	228, 231, 235, 0, 229, 0, 230, 0, 
+	206, 0, 232, 0, 233, 0, 234, 0, 
+	204, 0, 236, 0, 237, 0, 204, 0, 
+	206, 239, 0, 240, 0, 241, 241, 0, 
+	241, 242, 241, 0, 243, 0, 226, 0, 
+	38, 245, 0, 196, 58, 196, 0, 247, 
+	0, 248, 0, 249, 0, 250, 0, 204, 
+	0, 252, 170, 0, 253, 0, 204, 0, 
+	255, 0, 210, 0, 228, 0, 564, 177, 
+	177, 185, 257, 177, 257, 564, 188, 257, 
+	257, 0, 252, 0, 175, 261, 0, 126, 
+	0, 144, 0, 561, 93, 93, 101, 263, 
 	93, 263, 561, 104, 263, 263, 0, 168, 
-	0, 91, 567, 266, 567, 266, 266, 0, 
-	170, 0, 269, 0, 270, 0, 271, 0, 
-	1, 2, 272, 1, 272, 272, 0, 568, 
-	272, 568, 272, 272, 0, 274, 0, 275, 
-	275, 0, 275, 276, 275, 276, 276, 0, 
-	551, 276, 551, 276, 276, 0, 278, 0, 
-	279, 0, 280, 0, 281, 0, 282, 282, 
-	0, 282, 283, 286, 297, 299, 305, 365, 
-	282, 306, 365, 365, 0, 284, 367, 283, 
-	569, 285, 285, 285, 569, 296, 0, 282, 
-	283, 286, 297, 299, 305, 365, 282, 306, 
-	365, 365, 0, 287, 0, 289, 291, 0, 
-	288, 289, 291, 292, 288, 288, 290, 289, 
-	289, 288, 569, 285, 285, 293, 285, 569, 
-	296, 0, 294, 295, 294, 295, 295, 0, 
-	294, 295, 294, 295, 295, 0, 569, 285, 
-	285, 293, 285, 295, 569, 296, 295, 295, 
-	0, 282, 283, 286, 297, 299, 305, 285, 
-	365, 282, 306, 365, 365, 0, 284, 298, 
-	297, 297, 299, 300, 299, 0, 570, 285, 
-	285, 285, 570, 296, 0, 302, 0, 303, 
-	0, 304, 304, 0, 304, 283, 286, 297, 
-	299, 305, 309, 304, 306, 309, 309, 0, 
-	306, 0, 569, 285, 285, 307, 285, 569, 
-	306, 296, 0, 308, 0, 569, 285, 285, 
-	285, 569, 308, 296, 0, 571, 285, 285, 
-	293, 285, 309, 571, 296, 309, 309, 0, 
-	311, 0, 312, 0, 570, 285, 285, 285, 
-	300, 570, 296, 0, 314, 0, 282, 282, 
-	0, 314, 17, 314, 0, 317, 0, 318, 
-	0, 312, 0, 274, 320, 0, 321, 321, 
-	0, 321, 322, 326, 321, 0, 323, 0, 
-	324, 0, 325, 0, 570, 285, 285, 285, 
-	570, 296, 0, 327, 330, 0, 328, 0, 
-	329, 329, 0, 329, 322, 326, 329, 0, 
-	331, 0, 325, 0, 314, 333, 314, 0, 
-	334, 28, 0, 314, 0, 336, 339, 343, 
-	0, 337, 0, 338, 0, 314, 0, 340, 
-	0, 341, 0, 342, 0, 312, 0, 344, 
-	0, 345, 0, 312, 0, 314, 347, 0, 
-	348, 0, 349, 349, 0, 349, 350, 349, 
-	0, 351, 0, 334, 0, 38, 353, 0, 
-	304, 58, 304, 0, 355, 0, 356, 0, 
-	357, 0, 358, 0, 312, 0, 360, 170, 
-	0, 361, 0, 312, 0, 363, 0, 318, 
-	0, 336, 0, 569, 285, 285, 293, 285, 
-	365, 569, 296, 365, 365, 0, 360, 0, 
-	283, 368, 369, 373, 384, 386, 420, 424, 
-	368, 421, 424, 424, 0, 370, 449, 369, 
-	371, 572, 372, 372, 372, 371, 383, 0, 
-	371, 572, 372, 372, 372, 389, 425, 392, 
-	393, 428, 394, 407, 431, 414, 419, 439, 
-	444, 447, 371, 383, 0, 368, 369, 373, 
-	384, 386, 420, 424, 368, 421, 424, 424, 
+	0, 91, 567, 266, 266, 567, 266, 266, 
+	0, 170, 0, 269, 0, 270, 0, 271, 
+	0, 1, 2, 272, 272, 1, 272, 272, 
+	0, 568, 272, 272, 568, 272, 272, 0, 
+	274, 0, 275, 275, 0, 275, 276, 276, 
+	275, 276, 276, 0, 551, 276, 276, 551, 
+	276, 276, 0, 278, 0, 279, 0, 280, 
+	0, 281, 0, 282, 282, 0, 282, 283, 
+	286, 297, 299, 305, 365, 365, 282, 306, 
+	365, 365, 0, 284, 367, 283, 569, 285, 
+	285, 285, 569, 296, 0, 282, 283, 286, 
+	297, 299, 305, 365, 365, 282, 306, 365, 
+	365, 0, 287, 0, 289, 291, 0, 288, 
+	289, 291, 292, 288, 288, 290, 289, 289, 
+	288, 569, 285, 285, 293, 285, 569, 296, 
+	0, 294, 295, 295, 294, 295, 295, 0, 
+	294, 295, 295, 294, 295, 295, 0, 569, 
+	285, 285, 293, 295, 285, 295, 569, 296, 
+	295, 295, 0, 282, 283, 286, 297, 299, 
+	305, 365, 285, 365, 282, 306, 365, 365, 
+	0, 284, 298, 297, 297, 299, 300, 299, 
+	0, 570, 285, 285, 285, 570, 296, 0, 
+	302, 0, 303, 0, 304, 304, 0, 304, 
+	283, 286, 297, 299, 305, 309, 309, 304, 
+	306, 309, 309, 0, 306, 0, 569, 285, 
+	285, 307, 285, 569, 306, 296, 0, 308, 
+	0, 569, 285, 285, 285, 569, 308, 296, 
+	0, 571, 285, 285, 293, 309, 285, 309, 
+	571, 296, 309, 309, 0, 311, 0, 312, 
+	0, 570, 285, 285, 285, 300, 570, 296, 
+	0, 314, 0, 282, 282, 0, 314, 17, 
+	314, 0, 317, 0, 318, 0, 312, 0, 
+	274, 320, 0, 321, 321, 0, 321, 322, 
+	326, 321, 0, 323, 0, 324, 0, 325, 
+	0, 570, 285, 285, 285, 570, 296, 0, 
+	327, 330, 0, 328, 0, 329, 329, 0, 
+	329, 322, 326, 329, 0, 331, 0, 325, 
+	0, 314, 333, 314, 0, 334, 28, 0, 
+	314, 0, 336, 339, 343, 0, 337, 0, 
+	338, 0, 314, 0, 340, 0, 341, 0, 
+	342, 0, 312, 0, 344, 0, 345, 0, 
+	312, 0, 314, 347, 0, 348, 0, 349, 
+	349, 0, 349, 350, 349, 0, 351, 0, 
+	334, 0, 38, 353, 0, 304, 58, 304, 
+	0, 355, 0, 356, 0, 357, 0, 358, 
+	0, 312, 0, 360, 170, 0, 361, 0, 
+	312, 0, 363, 0, 318, 0, 336, 0, 
+	569, 285, 285, 293, 365, 285, 365, 569, 
+	296, 365, 365, 0, 360, 0, 283, 368, 
+	369, 373, 384, 386, 420, 424, 424, 368, 
+	421, 424, 424, 0, 370, 449, 369, 371, 
+	572, 372, 372, 372, 371, 383, 0, 371, 
+	572, 372, 372, 372, 389, 425, 392, 393, 
+	428, 394, 407, 431, 414, 419, 439, 444, 
+	447, 371, 383, 0, 368, 369, 373, 384, 
+	386, 420, 424, 424, 368, 421, 424, 424, 
 	0, 374, 0, 376, 378, 0, 375, 376, 
 	378, 379, 375, 375, 377, 376, 376, 375, 
 	371, 572, 372, 372, 380, 372, 371, 383, 
-	0, 381, 382, 381, 382, 382, 0, 381, 
-	382, 381, 382, 382, 0, 371, 572, 372, 
-	372, 380, 372, 382, 371, 383, 382, 382, 
-	0, 368, 369, 373, 384, 386, 420, 372, 
-	424, 368, 421, 424, 424, 0, 370, 385, 
-	384, 384, 386, 387, 386, 0, 388, 572, 
-	372, 372, 372, 388, 383, 0, 388, 572, 
-	372, 372, 372, 389, 392, 393, 394, 407, 
-	410, 414, 419, 388, 383, 0, 390, 0, 
-	391, 0, 368, 368, 0, 391, 0, 391, 
-	391, 0, 395, 0, 396, 396, 0, 396, 
-	397, 401, 396, 0, 398, 0, 399, 0, 
-	400, 0, 388, 572, 372, 372, 372, 388, 
-	383, 0, 402, 405, 0, 403, 0, 404, 
-	404, 0, 404, 397, 401, 404, 0, 406, 
-	0, 400, 0, 391, 408, 391, 0, 409, 
-	0, 391, 0, 411, 0, 412, 0, 413, 
-	0, 391, 0, 391, 415, 0, 416, 0, 
-	417, 417, 0, 417, 418, 417, 0, 408, 
-	0, 391, 0, 421, 0, 371, 572, 372, 
-	372, 422, 372, 371, 421, 383, 0, 423, 
-	0, 371, 572, 372, 372, 372, 371, 423, 
-	383, 0, 371, 572, 372, 372, 380, 372, 
-	424, 371, 383, 424, 424, 0, 426, 0, 
-	427, 0, 388, 572, 372, 372, 372, 387, 
-	388, 383, 0, 429, 0, 430, 0, 427, 
-	0, 411, 432, 436, 0, 433, 0, 434, 
-	0, 435, 0, 427, 0, 437, 0, 438, 
-	0, 427, 0, 440, 0, 441, 0, 442, 
-	0, 443, 0, 427, 0, 445, 0, 446, 
-	0, 427, 0, 448, 0, 430, 0, 369, 
-	450, 451, 458, 450, 458, 458, 0, 451, 
-	452, 451, 0, 453, 573, 453, 0, 453, 
-	573, 454, 453, 0, 455, 0, 456, 0, 
-	457, 0, 450, 451, 458, 450, 458, 458, 
-	0, 459, 573, 458, 459, 458, 458, 0, 
+	0, 381, 382, 382, 381, 382, 382, 0, 
+	381, 382, 382, 381, 382, 382, 0, 371, 
+	572, 372, 372, 380, 382, 372, 382, 371, 
+	383, 382, 382, 0, 368, 369, 373, 384, 
+	386, 420, 424, 372, 424, 368, 421, 424, 
+	424, 0, 370, 385, 384, 384, 386, 387, 
+	386, 0, 388, 572, 372, 372, 372, 388, 
+	383, 0, 388, 572, 372, 372, 372, 389, 
+	392, 393, 394, 407, 410, 414, 419, 388, 
+	383, 0, 390, 0, 391, 0, 368, 368, 
+	0, 391, 0, 391, 391, 0, 395, 0, 
+	396, 396, 0, 396, 397, 401, 396, 0, 
+	398, 0, 399, 0, 400, 0, 388, 572, 
+	372, 372, 372, 388, 383, 0, 402, 405, 
+	0, 403, 0, 404, 404, 0, 404, 397, 
+	401, 404, 0, 406, 0, 400, 0, 391, 
+	408, 391, 0, 409, 0, 391, 0, 411, 
+	0, 412, 0, 413, 0, 391, 0, 391, 
+	415, 0, 416, 0, 417, 417, 0, 417, 
+	418, 417, 0, 408, 0, 391, 0, 421, 
+	0, 371, 572, 372, 372, 422, 372, 371, 
+	421, 383, 0, 423, 0, 371, 572, 372, 
+	372, 372, 371, 423, 383, 0, 371, 572, 
+	372, 372, 380, 424, 372, 424, 371, 383, 
+	424, 424, 0, 426, 0, 427, 0, 388, 
+	572, 372, 372, 372, 387, 388, 383, 0, 
+	429, 0, 430, 0, 427, 0, 411, 432, 
+	436, 0, 433, 0, 434, 0, 435, 0, 
+	427, 0, 437, 0, 438, 0, 427, 0, 
+	440, 0, 441, 0, 442, 0, 443, 0, 
+	427, 0, 445, 0, 446, 0, 427, 0, 
+	448, 0, 430, 0, 369, 450, 451, 458, 
+	458, 450, 458, 458, 0, 451, 452, 451, 
+	0, 453, 573, 453, 0, 453, 573, 454, 
+	453, 0, 455, 0, 456, 0, 457, 0, 
+	450, 451, 458, 458, 450, 458, 458, 0, 
+	459, 573, 458, 458, 459, 458, 458, 0, 
 	459, 573, 454, 460, 464, 459, 0, 461, 
-	0, 462, 462, 0, 462, 463, 462, 463, 
-	463, 0, 453, 573, 463, 453, 463, 463, 
-	0, 465, 0, 466, 0, 467, 0, 468, 
-	0, 469, 469, 0, 469, 470, 474, 485, 
-	487, 521, 525, 469, 522, 525, 525, 0, 
-	471, 550, 470, 472, 573, 473, 473, 473, 
-	472, 484, 0, 472, 573, 473, 473, 473, 
-	490, 526, 493, 454, 494, 529, 495, 508, 
-	532, 515, 520, 540, 545, 548, 472, 484, 
-	0, 469, 470, 474, 485, 487, 521, 525, 
-	469, 522, 525, 525, 0, 475, 0, 477, 
-	479, 0, 476, 477, 479, 480, 476, 476, 
-	478, 477, 477, 476, 472, 573, 473, 473, 
-	481, 473, 472, 484, 0, 482, 483, 482, 
-	483, 483, 0, 482, 483, 482, 483, 483, 
-	0, 472, 573, 473, 473, 481, 473, 483, 
-	472, 484, 483, 483, 0, 469, 470, 474, 
-	485, 487, 521, 473, 525, 469, 522, 525, 
+	0, 462, 462, 0, 462, 463, 463, 462, 
+	463, 463, 0, 453, 573, 463, 463, 453, 
+	463, 463, 0, 465, 0, 466, 0, 467, 
+	0, 468, 0, 469, 469, 0, 469, 470, 
+	474, 485, 487, 521, 525, 525, 469, 522, 
+	525, 525, 0, 471, 550, 470, 472, 573, 
+	473, 473, 473, 472, 484, 0, 472, 573, 
+	473, 473, 473, 490, 526, 493, 454, 494, 
+	529, 495, 508, 532, 515, 520, 540, 545, 
+	548, 472, 484, 0, 469, 470, 474, 485, 
+	487, 521, 525, 525, 469, 522, 525, 525, 
+	0, 475, 0, 477, 479, 0, 476, 477, 
+	479, 480, 476, 476, 478, 477, 477, 476, 
+	472, 573, 473, 473, 481, 473, 472, 484, 
+	0, 482, 483, 483, 482, 483, 483, 0, 
+	482, 483, 483, 482, 483, 483, 0, 472, 
+	573, 473, 473, 481, 483, 473, 483, 472, 
+	484, 483, 483, 0, 469, 470, 474, 485, 
+	487, 521, 525, 473, 525, 469, 522, 525, 
 	525, 0, 471, 486, 485, 485, 487, 488, 
 	487, 0, 489, 573, 473, 473, 473, 489, 
 	484, 0, 489, 573, 473, 473, 473, 490, 
@@ -975,65 +993,66 @@ static const short _querybuilder_trans_targs[] = {
 	0, 522, 0, 472, 573, 473, 473, 523, 
 	473, 472, 522, 484, 0, 524, 0, 472, 
 	573, 473, 473, 473, 472, 524, 484, 0, 
-	472, 573, 473, 473, 481, 473, 525, 472, 
-	484, 525, 525, 0, 527, 0, 528, 0, 
-	489, 573, 473, 473, 473, 488, 489, 484, 
-	0, 530, 0, 531, 0, 528, 0, 512, 
-	533, 537, 0, 534, 0, 535, 0, 536, 
-	0, 528, 0, 538, 0, 539, 0, 528, 
-	0, 541, 0, 542, 0, 543, 0, 544, 
-	0, 528, 0, 546, 0, 547, 0, 528, 
-	0, 549, 0, 531, 0, 470, 551, 4, 
-	268, 16, 26, 83, 46, 551, 0, 552, 
-	4, 10, 16, 26, 83, 46, 552, 0, 
-	553, 4, 10, 16, 79, 26, 83, 46, 
-	85, 553, 0, 554, 24, 26, 56, 46, 
-	554, 0, 555, 34, 37, 46, 555, 0, 
-	556, 37, 46, 556, 0, 557, 46, 557, 
-	0, 558, 558, 0, 559, 64, 66, 69, 
-	70, 72, 26, 37, 46, 559, 0, 560, 
-	64, 26, 37, 46, 560, 0, 561, 93, 
+	472, 573, 473, 473, 481, 525, 473, 525, 
+	472, 484, 525, 525, 0, 527, 0, 528, 
+	0, 489, 573, 473, 473, 473, 488, 489, 
+	484, 0, 530, 0, 531, 0, 528, 0, 
+	512, 533, 537, 0, 534, 0, 535, 0, 
+	536, 0, 528, 0, 538, 0, 539, 0, 
+	528, 0, 541, 0, 542, 0, 543, 0, 
+	544, 0, 528, 0, 546, 0, 547, 0, 
+	528, 0, 549, 0, 531, 0, 470, 551, 
+	4, 268, 16, 26, 83, 46, 551, 0, 
+	552, 4, 10, 16, 26, 83, 46, 552, 
+	0, 553, 4, 10, 16, 79, 26, 83, 
+	46, 85, 553, 0, 554, 24, 26, 56, 
+	46, 554, 0, 555, 34, 37, 46, 555, 
+	0, 556, 37, 46, 556, 0, 557, 46, 
+	557, 0, 558, 558, 0, 559, 64, 66, 
+	69, 70, 72, 26, 37, 46, 559, 0, 
+	560, 64, 26, 37, 46, 560, 0, 561, 
+	93, 93, 93, 109, 118, 121, 10, 123, 
+	124, 127, 140, 143, 154, 160, 46, 162, 
+	264, 260, 561, 104, 0, 562, 93, 93, 
+	93, 109, 121, 10, 123, 127, 140, 262, 
+	154, 160, 46, 562, 104, 0, 563, 93, 
 	93, 93, 109, 118, 121, 10, 123, 124, 
-	127, 140, 143, 154, 160, 46, 162, 264, 
-	260, 561, 104, 0, 562, 93, 93, 93, 
-	109, 121, 10, 123, 127, 140, 262, 154, 
-	160, 46, 562, 104, 0, 563, 93, 93, 
-	93, 109, 118, 121, 10, 123, 124, 127, 
-	140, 143, 154, 160, 46, 162, 167, 260, 
-	563, 104, 0, 564, 177, 177, 177, 193, 
+	127, 140, 143, 154, 160, 46, 162, 167, 
+	260, 563, 104, 0, 564, 177, 177, 177, 
+	193, 202, 205, 10, 207, 208, 211, 224, 
+	227, 238, 244, 46, 246, 258, 254, 564, 
+	188, 0, 565, 177, 177, 177, 193, 205, 
+	10, 207, 211, 224, 256, 238, 244, 46, 
+	565, 188, 0, 566, 177, 177, 177, 193, 
 	202, 205, 10, 207, 208, 211, 224, 227, 
-	238, 244, 46, 246, 258, 254, 564, 188, 
-	0, 565, 177, 177, 177, 193, 205, 10, 
-	207, 211, 224, 256, 238, 244, 46, 565, 
-	188, 0, 566, 177, 177, 177, 193, 202, 
-	205, 10, 207, 208, 211, 224, 227, 238, 
-	244, 46, 246, 251, 254, 566, 188, 0, 
-	567, 4, 10, 16, 79, 26, 83, 46, 
-	267, 567, 0, 568, 4, 268, 16, 273, 
-	26, 83, 46, 277, 568, 0, 569, 285, 
+	238, 244, 46, 246, 251, 254, 566, 188, 
+	0, 567, 4, 10, 16, 79, 26, 83, 
+	46, 267, 567, 0, 568, 4, 268, 16, 
+	273, 26, 83, 46, 277, 568, 0, 569, 
+	285, 285, 285, 301, 310, 313, 268, 315, 
+	316, 319, 332, 335, 346, 352, 46, 354, 
+	366, 362, 569, 296, 0, 570, 285, 285, 
+	285, 301, 313, 268, 315, 319, 332, 364, 
+	346, 352, 46, 570, 296, 0, 571, 285, 
 	285, 285, 301, 310, 313, 268, 315, 316, 
-	319, 332, 335, 346, 352, 46, 354, 366, 
-	362, 569, 296, 0, 570, 285, 285, 285, 
-	301, 313, 268, 315, 319, 332, 364, 346, 
-	352, 46, 570, 296, 0, 571, 285, 285, 
-	285, 301, 310, 313, 268, 315, 316, 319, 
-	332, 335, 346, 352, 46, 354, 359, 362, 
-	571, 296, 0, 0, 0, 0
+	319, 332, 335, 346, 352, 46, 354, 359, 
+	362, 571, 296, 0, 0, 0, 0
 };
 
 static const unsigned char _querybuilder_trans_actions[] = {
-	0, 37, 1, 0, 1, 1, 0, 0, 
-	0, 0, 0, 0, 0, 59, 1, 0, 
-	1, 0, 57, 57, 0, 0, 37, 1, 
-	0, 1, 1, 0, 0, 0, 0, 0, 
-	0, 0, 59, 0, 0, 0, 0, 0, 
-	0, 55, 163, 160, 55, 160, 160, 0, 
-	0, 37, 1, 0, 1, 1, 0, 23, 
-	1, 23, 1, 1, 59, 0, 0, 0, 
+	0, 37, 1, 1, 0, 1, 1, 0, 
+	0, 0, 0, 0, 0, 0, 59, 1, 
+	0, 1, 0, 57, 57, 0, 0, 37, 
+	1, 1, 0, 1, 1, 0, 0, 0, 
+	0, 0, 0, 0, 59, 0, 0, 0, 
+	0, 0, 0, 55, 163, 160, 160, 55, 
+	160, 160, 0, 0, 37, 1, 1, 0, 
+	1, 1, 0, 23, 1, 1, 23, 1, 
+	1, 59, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 53, 157, 
-	53, 157, 157, 0, 0, 1, 0, 1, 
-	1, 0, 13, 13, 13, 1, 13, 1, 
+	0, 0, 0, 53, 157, 157, 53, 157, 
+	157, 0, 0, 1, 1, 0, 1, 1, 
+	0, 13, 13, 13, 1, 1, 13, 1, 
 	1, 59, 0, 0, 0, 0, 0, 0, 
 	0, 0, 49, 151, 49, 151, 0, 0, 
 	1, 0, 1, 0, 1, 0, 9, 9, 
@@ -1044,83 +1063,138 @@ static const unsigned char _querybuilder_trans_actions[] = {
 	1, 0, 1, 0, 9, 9, 1, 59, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 47, 148, 
-	47, 148, 148, 0, 0, 1, 0, 1, 
-	1, 0, 45, 1, 45, 1, 1, 59, 
+	148, 47, 148, 148, 0, 0, 1, 1, 
+	0, 1, 1, 0, 45, 1, 1, 45, 
+	1, 1, 59, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 51, 154, 51, 154, 154, 0, 
-	0, 1, 0, 1, 1, 0, 13, 13, 
-	13, 1, 13, 1, 1, 59, 1, 0, 
-	1, 0, 21, 21, 21, 59, 1, 0, 
-	1, 0, 1, 0, 1, 0, 19, 109, 
-	19, 109, 109, 0, 0, 1, 0, 1, 
-	1, 0, 15, 15, 15, 1, 15, 1, 
-	1, 59, 19, 109, 19, 109, 109, 0, 
-	0, 1, 0, 1, 1, 0, 15, 15, 
-	15, 1, 15, 1, 1, 59, 0, 0, 
-	0, 0, 0, 0, 1, 0, 1, 1, 
-	0, 41, 1, 41, 1, 1, 59, 0, 
-	1, 0, 57, 0, 57, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 31, 31, 
-	0, 0, 0, 0, 0, 33, 1, 1, 
-	0, 1, 1, 1, 0, 5, 0, 1, 
-	0, 1, 1, 1, 0, 1, 59, 25, 
-	25, 25, 25, 121, 118, 118, 25, 118, 
+	0, 0, 0, 0, 0, 51, 154, 154, 
+	51, 154, 154, 0, 0, 1, 1, 0, 
+	1, 1, 0, 13, 13, 13, 1, 1, 
+	13, 1, 1, 59, 1, 0, 1, 0, 
+	21, 21, 21, 59, 1, 0, 1, 0, 
+	1, 0, 1, 0, 19, 109, 109, 19, 
+	109, 109, 0, 0, 1, 1, 0, 1, 
+	1, 0, 15, 15, 15, 1, 1, 15, 
+	1, 1, 59, 19, 109, 109, 19, 109, 
+	109, 0, 0, 1, 1, 0, 1, 1, 
+	0, 15, 15, 15, 1, 1, 15, 1, 
+	1, 59, 0, 0, 0, 0, 0, 0, 
+	1, 1, 0, 1, 1, 0, 41, 1, 
+	1, 41, 1, 1, 59, 0, 1, 0, 
+	57, 0, 57, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 31, 31, 0, 0, 
+	0, 0, 0, 33, 1, 1, 1, 0, 
+	1, 1, 1, 0, 5, 0, 1, 0, 
+	1, 1, 1, 0, 1, 59, 25, 25, 
+	25, 25, 121, 118, 118, 118, 25, 118, 
 	118, 118, 0, 0, 0, 1, 0, 0, 
 	1, 1, 0, 7, 1, 1, 1, 1, 
 	1, 1, 0, 1, 1, 0, 1, 0, 
-	1, 59, 19, 109, 19, 109, 109, 0, 
-	0, 1, 0, 1, 1, 0, 15, 91, 
-	91, 15, 91, 1, 15, 91, 1, 1, 
-	59, 25, 25, 25, 25, 121, 118, 1, 
-	118, 25, 118, 118, 118, 0, 3, 0, 
-	1, 1, 0, 0, 0, 0, 0, 1, 
-	1, 1, 0, 1, 59, 1, 0, 1, 
-	0, 166, 166, 0, 0, 0, 0, 0, 
-	139, 1, 1, 0, 1, 1, 1, 0, 
-	1, 0, 9, 61, 61, 1, 61, 9, 
-	1, 61, 59, 1, 0, 11, 70, 70, 
-	70, 11, 1, 70, 59, 112, 79, 79, 
-	13, 79, 1, 112, 79, 1, 1, 59, 
-	1, 0, 1, 0, 29, 127, 127, 127, 
-	29, 29, 127, 59, 1, 0, 25, 25, 
+	1, 59, 19, 109, 109, 19, 109, 109, 
+	0, 0, 1, 1, 0, 1, 1, 0, 
+	15, 91, 91, 15, 1, 91, 1, 15, 
+	91, 1, 1, 59, 25, 25, 25, 25, 
+	121, 118, 118, 1, 118, 25, 118, 118, 
+	118, 0, 3, 0, 1, 1, 0, 0, 
+	0, 0, 0, 1, 1, 1, 0, 1, 
+	59, 1, 0, 1, 0, 166, 166, 0, 
+	0, 0, 0, 0, 139, 1, 1, 1, 
+	0, 1, 1, 1, 0, 1, 0, 9, 
+	61, 61, 1, 61, 9, 1, 61, 59, 
+	1, 0, 11, 70, 70, 70, 11, 1, 
+	70, 59, 112, 79, 79, 13, 1, 79, 
+	1, 112, 79, 1, 1, 59, 1, 0, 
+	1, 0, 29, 127, 127, 127, 29, 29, 
+	127, 59, 1, 0, 25, 25, 0, 1, 
 	0, 1, 0, 1, 0, 1, 0, 1, 
-	0, 1, 0, 0, 0, 0, 27, 27, 
-	0, 0, 1, 1, 0, 0, 1, 0, 
-	1, 0, 1, 0, 17, 100, 100, 100, 
-	17, 100, 59, 1, 1, 0, 1, 0, 
-	1, 1, 0, 1, 1, 1, 1, 0, 
-	1, 0, 1, 0, 1, 1, 1, 0, 
-	1, 0, 0, 1, 0, 1, 1, 1, 
+	0, 0, 0, 0, 27, 27, 0, 0, 
+	1, 1, 0, 0, 1, 0, 1, 0, 
+	1, 0, 17, 100, 100, 100, 17, 100, 
+	59, 1, 1, 0, 1, 0, 1, 1, 
+	0, 1, 1, 1, 1, 0, 1, 0, 
+	1, 0, 1, 1, 1, 0, 1, 0, 
+	0, 1, 0, 1, 1, 1, 0, 1, 
 	0, 1, 0, 1, 0, 1, 0, 1, 
 	0, 1, 0, 1, 0, 1, 0, 1, 
-	0, 1, 0, 1, 0, 1, 1, 0, 
-	1, 0, 25, 25, 0, 0, 1, 0, 
-	0, 1, 0, 1, 0, 0, 1, 0, 
-	166, 0, 166, 0, 1, 0, 1, 0, 
-	1, 0, 1, 0, 1, 0, 1, 0, 
-	0, 1, 0, 1, 0, 0, 0, 0, 
-	0, 0, 0, 31, 31, 0, 0, 0, 
-	0, 0, 33, 1, 1, 0, 1, 1, 
-	1, 0, 5, 0, 1, 0, 1, 1, 
-	1, 0, 1, 59, 25, 25, 25, 25, 
-	121, 118, 118, 25, 118, 118, 118, 0, 
+	0, 1, 0, 1, 1, 0, 1, 0, 
+	25, 25, 0, 0, 1, 0, 0, 1, 
+	0, 1, 0, 0, 1, 0, 166, 0, 
+	166, 0, 1, 0, 1, 0, 1, 0, 
+	1, 0, 1, 0, 1, 0, 0, 1, 
+	0, 1, 0, 0, 0, 0, 0, 0, 
+	0, 31, 31, 0, 0, 0, 0, 0, 
+	33, 1, 1, 1, 0, 1, 1, 1, 
+	0, 5, 0, 1, 0, 1, 1, 1, 
+	0, 1, 59, 25, 25, 25, 25, 121, 
+	118, 118, 118, 25, 118, 118, 118, 0, 
 	0, 0, 1, 0, 0, 1, 1, 0, 
 	7, 1, 1, 1, 1, 1, 1, 0, 
 	1, 1, 0, 1, 0, 1, 59, 19, 
-	109, 19, 109, 109, 0, 0, 1, 0, 
-	1, 1, 0, 15, 91, 91, 15, 91, 
-	1, 15, 91, 1, 1, 59, 25, 25, 
-	25, 25, 121, 118, 1, 118, 25, 118, 
-	118, 118, 0, 3, 0, 1, 1, 0, 
-	0, 0, 0, 0, 1, 1, 1, 0, 
-	1, 59, 1, 0, 1, 0, 166, 166, 
-	0, 0, 0, 0, 0, 136, 1, 1, 
-	0, 1, 1, 1, 0, 1, 0, 9, 
-	61, 61, 1, 61, 9, 1, 61, 59, 
-	1, 0, 11, 70, 70, 70, 11, 1, 
-	70, 59, 112, 79, 79, 13, 79, 1, 
-	112, 79, 1, 1, 59, 1, 0, 1, 
+	109, 109, 19, 109, 109, 0, 0, 1, 
+	1, 0, 1, 1, 0, 15, 91, 91, 
+	15, 1, 91, 1, 15, 91, 1, 1, 
+	59, 25, 25, 25, 25, 121, 118, 118, 
+	1, 118, 25, 118, 118, 118, 0, 3, 
+	0, 1, 1, 0, 0, 0, 0, 0, 
+	1, 1, 1, 0, 1, 59, 1, 0, 
+	1, 0, 166, 166, 0, 0, 0, 0, 
+	0, 136, 1, 1, 1, 0, 1, 1, 
+	1, 0, 1, 0, 9, 61, 61, 1, 
+	61, 9, 1, 61, 59, 1, 0, 11, 
+	70, 70, 70, 11, 1, 70, 59, 112, 
+	79, 79, 13, 1, 79, 1, 112, 79, 
+	1, 1, 59, 1, 0, 1, 0, 29, 
+	127, 127, 127, 29, 29, 127, 59, 1, 
+	0, 25, 25, 0, 1, 0, 1, 0, 
+	1, 0, 1, 0, 1, 0, 0, 0, 
+	0, 27, 27, 0, 0, 1, 1, 0, 
+	0, 1, 0, 1, 0, 1, 0, 17, 
+	100, 100, 100, 17, 100, 59, 1, 1, 
+	0, 1, 0, 1, 1, 0, 1, 1, 
+	1, 1, 0, 1, 0, 1, 0, 1, 
+	1, 1, 0, 1, 0, 0, 1, 0, 
+	1, 1, 1, 0, 1, 0, 1, 0, 
+	1, 0, 1, 0, 1, 0, 1, 0, 
+	1, 0, 1, 0, 1, 0, 1, 0, 
+	1, 1, 0, 1, 0, 25, 25, 0, 
+	0, 1, 0, 0, 1, 0, 1, 0, 
+	0, 1, 0, 166, 0, 166, 0, 1, 
+	0, 1, 0, 1, 0, 1, 0, 1, 
+	0, 1, 0, 0, 1, 0, 1, 0, 
+	1, 0, 1, 0, 1, 0, 13, 79, 
+	79, 13, 1, 79, 1, 13, 79, 1, 
+	1, 59, 1, 0, 1, 1, 0, 1, 
+	0, 1, 0, 13, 79, 79, 13, 1, 
+	79, 1, 13, 79, 1, 1, 59, 1, 
+	0, 1, 23, 1, 1, 23, 1, 1, 
+	59, 0, 0, 0, 0, 0, 0, 0, 
+	0, 55, 163, 160, 160, 55, 160, 160, 
+	0, 23, 1, 1, 23, 1, 1, 59, 
+	0, 0, 0, 0, 0, 0, 1, 1, 
+	0, 1, 1, 0, 41, 1, 1, 41, 
+	1, 1, 59, 0, 0, 0, 0, 0, 
+	0, 0, 0, 31, 31, 0, 0, 0, 
+	0, 0, 33, 1, 1, 1, 0, 1, 
+	1, 1, 0, 5, 0, 1, 0, 1, 
+	1, 1, 0, 1, 59, 25, 25, 25, 
+	25, 121, 118, 118, 118, 25, 118, 118, 
+	118, 0, 0, 0, 1, 0, 0, 1, 
+	1, 0, 7, 1, 1, 1, 1, 1, 
+	1, 0, 1, 1, 0, 1, 0, 1, 
+	59, 19, 109, 109, 19, 109, 109, 0, 
+	0, 1, 1, 0, 1, 1, 0, 15, 
+	91, 91, 15, 1, 91, 1, 15, 91, 
+	1, 1, 59, 25, 25, 25, 25, 121, 
+	118, 118, 1, 118, 25, 118, 118, 118, 
+	0, 3, 0, 1, 1, 0, 0, 0, 
+	0, 0, 1, 1, 1, 0, 1, 59, 
+	1, 0, 1, 0, 124, 124, 0, 0, 
+	0, 0, 0, 136, 1, 1, 1, 0, 
+	1, 1, 1, 0, 1, 0, 9, 61, 
+	61, 1, 61, 9, 1, 61, 59, 1, 
+	0, 11, 70, 70, 70, 11, 1, 70, 
+	59, 82, 79, 79, 13, 1, 79, 1, 
+	82, 79, 1, 1, 59, 1, 0, 1, 
 	0, 29, 127, 127, 127, 29, 29, 127, 
 	59, 1, 0, 25, 25, 0, 1, 0, 
 	1, 0, 1, 0, 1, 0, 1, 0, 
@@ -1135,126 +1209,79 @@ static const unsigned char _querybuilder_trans_actions[] = {
 	1, 0, 1, 0, 1, 0, 1, 0, 
 	1, 0, 1, 1, 0, 1, 0, 25, 
 	25, 0, 0, 1, 0, 0, 1, 0, 
-	1, 0, 0, 1, 0, 166, 0, 166, 
-	0, 1, 0, 1, 0, 1, 0, 1, 
-	0, 1, 0, 1, 0, 0, 1, 0, 
-	1, 0, 1, 0, 1, 0, 1, 0, 
-	13, 79, 79, 13, 79, 1, 13, 79, 
-	1, 1, 59, 1, 0, 1, 1, 0, 
-	1, 0, 1, 0, 13, 79, 79, 13, 
-	79, 1, 13, 79, 1, 1, 59, 1, 
-	0, 1, 23, 1, 23, 1, 1, 59, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
-	55, 163, 160, 55, 160, 160, 0, 23, 
-	1, 23, 1, 1, 59, 0, 0, 0, 
-	0, 0, 0, 1, 0, 1, 1, 0, 
-	41, 1, 41, 1, 1, 59, 0, 0, 
-	0, 0, 0, 0, 0, 0, 31, 31, 
-	0, 0, 0, 0, 0, 33, 1, 1, 
-	0, 1, 1, 1, 0, 5, 0, 1, 
-	0, 1, 1, 1, 0, 1, 59, 25, 
-	25, 25, 25, 121, 118, 118, 25, 118, 
-	118, 118, 0, 0, 0, 1, 0, 0, 
-	1, 1, 0, 7, 1, 1, 1, 1, 
-	1, 1, 0, 1, 1, 0, 1, 0, 
-	1, 59, 19, 109, 19, 109, 109, 0, 
-	0, 1, 0, 1, 1, 0, 15, 91, 
-	91, 15, 91, 1, 15, 91, 1, 1, 
-	59, 25, 25, 25, 25, 121, 118, 1, 
-	118, 25, 118, 118, 118, 0, 3, 0, 
-	1, 1, 0, 0, 0, 0, 0, 1, 
-	1, 1, 0, 1, 59, 1, 0, 1, 
-	0, 124, 124, 0, 0, 0, 0, 0, 
-	136, 1, 1, 0, 1, 1, 1, 0, 
-	1, 0, 9, 61, 61, 1, 61, 9, 
-	1, 61, 59, 1, 0, 11, 70, 70, 
-	70, 11, 1, 70, 59, 82, 79, 79, 
-	13, 79, 1, 82, 79, 1, 1, 59, 
-	1, 0, 1, 0, 29, 127, 127, 127, 
-	29, 29, 127, 59, 1, 0, 25, 25, 
-	0, 1, 0, 1, 0, 1, 0, 1, 
-	0, 1, 0, 0, 0, 0, 27, 27, 
-	0, 0, 1, 1, 0, 0, 1, 0, 
-	1, 0, 1, 0, 17, 100, 100, 100, 
-	17, 100, 59, 1, 1, 0, 1, 0, 
-	1, 1, 0, 1, 1, 1, 1, 0, 
-	1, 0, 1, 0, 1, 1, 1, 0, 
-	1, 0, 0, 1, 0, 1, 1, 1, 
+	1, 0, 0, 1, 0, 124, 0, 124, 
 	0, 1, 0, 1, 0, 1, 0, 1, 
-	0, 1, 0, 1, 0, 1, 0, 1, 
-	0, 1, 0, 1, 0, 1, 1, 0, 
-	1, 0, 25, 25, 0, 0, 1, 0, 
 	0, 1, 0, 1, 0, 0, 1, 0, 
-	124, 0, 124, 0, 1, 0, 1, 0, 
 	1, 0, 1, 0, 1, 0, 1, 0, 
-	0, 1, 0, 1, 0, 1, 0, 1, 
-	0, 1, 0, 13, 79, 79, 13, 79, 
-	1, 13, 79, 1, 1, 59, 1, 0, 
-	1, 0, 0, 0, 0, 33, 1, 1, 
-	0, 1, 1, 1, 0, 5, 0, 1, 
-	0, 35, 1, 1, 1, 0, 1, 0, 
-	0, 35, 1, 1, 1, 1, 1, 1, 
-	1, 1, 0, 1, 1, 1, 1, 1, 
-	1, 1, 0, 1, 0, 25, 25, 25, 
-	25, 121, 118, 118, 25, 118, 118, 118, 
+	13, 79, 79, 13, 1, 79, 1, 13, 
+	79, 1, 1, 59, 1, 0, 1, 0, 
+	0, 0, 0, 33, 1, 1, 1, 0, 
+	1, 1, 1, 0, 5, 0, 1, 0, 
+	35, 1, 1, 1, 0, 1, 0, 0, 
+	35, 1, 1, 1, 1, 1, 1, 1, 
+	1, 0, 1, 1, 1, 1, 1, 1, 
+	1, 0, 1, 0, 25, 25, 25, 25, 
+	121, 118, 118, 118, 25, 118, 118, 118, 
 	0, 0, 0, 1, 0, 0, 1, 1, 
 	0, 7, 1, 1, 1, 1, 1, 1, 
 	0, 35, 1, 1, 0, 1, 0, 1, 
-	0, 19, 109, 19, 109, 109, 0, 0, 
-	1, 0, 1, 1, 0, 15, 94, 91, 
-	91, 15, 91, 1, 15, 91, 1, 1, 
-	0, 25, 25, 25, 25, 121, 118, 1, 
-	118, 25, 118, 118, 118, 0, 3, 0, 
-	1, 1, 0, 0, 0, 0, 0, 35, 
-	1, 1, 1, 0, 1, 0, 0, 35, 
-	1, 1, 1, 1, 1, 1, 0, 1, 
-	1, 1, 1, 0, 1, 0, 1, 0, 
-	1, 0, 25, 25, 0, 1, 0, 1, 
-	1, 0, 0, 0, 27, 27, 0, 0, 
-	1, 1, 0, 0, 1, 0, 1, 0, 
-	1, 0, 17, 103, 100, 100, 100, 17, 
-	100, 0, 1, 1, 0, 1, 0, 1, 
-	1, 0, 1, 1, 1, 1, 0, 1, 
-	0, 1, 0, 1, 1, 1, 0, 1, 
-	0, 1, 0, 1, 0, 1, 0, 1, 
-	0, 1, 0, 1, 1, 0, 1, 0, 
-	25, 25, 0, 0, 1, 0, 0, 1, 
-	0, 1, 0, 1, 0, 9, 64, 61, 
-	61, 1, 61, 9, 1, 61, 0, 1, 
-	0, 11, 73, 70, 70, 70, 11, 1, 
-	70, 0, 13, 85, 79, 79, 13, 79, 
-	1, 13, 79, 1, 1, 0, 1, 0, 
-	1, 0, 29, 130, 127, 127, 127, 29, 
-	29, 127, 0, 1, 0, 1, 0, 1, 
-	0, 1, 1, 1, 0, 1, 0, 1, 
-	0, 1, 0, 1, 0, 1, 0, 1, 
-	0, 1, 0, 1, 0, 1, 0, 1, 
-	0, 1, 0, 1, 0, 1, 0, 1, 
+	0, 19, 109, 109, 19, 109, 109, 0, 
+	0, 1, 1, 0, 1, 1, 0, 15, 
+	94, 91, 91, 15, 1, 91, 1, 15, 
+	91, 1, 1, 0, 25, 25, 25, 25, 
+	121, 118, 118, 1, 118, 25, 118, 118, 
+	118, 0, 3, 0, 1, 1, 0, 0, 
+	0, 0, 0, 35, 1, 1, 1, 0, 
+	1, 0, 0, 35, 1, 1, 1, 1, 
+	1, 1, 0, 1, 1, 1, 1, 0, 
+	1, 0, 1, 0, 1, 0, 25, 25, 
+	0, 1, 0, 1, 1, 0, 0, 0, 
+	27, 27, 0, 0, 1, 1, 0, 0, 
+	1, 0, 1, 0, 1, 0, 17, 103, 
+	100, 100, 100, 17, 100, 0, 1, 1, 
+	0, 1, 0, 1, 1, 0, 1, 1, 
+	1, 1, 0, 1, 0, 1, 0, 1, 
+	1, 1, 0, 1, 0, 1, 0, 1, 
 	0, 1, 0, 1, 0, 1, 0, 1, 
-	0, 37, 1, 0, 1, 1, 0, 0, 
-	0, 0, 0, 0, 39, 0, 0, 0, 
-	39, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 55, 163, 160, 55, 160, 160, 
-	0, 23, 115, 1, 23, 1, 1, 0, 
-	0, 39, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 1, 0, 1, 
-	1, 0, 41, 142, 1, 41, 1, 1, 
+	1, 0, 1, 0, 25, 25, 0, 0, 
+	1, 0, 0, 1, 0, 1, 0, 1, 
+	0, 9, 64, 61, 61, 1, 61, 9, 
+	1, 61, 0, 1, 0, 11, 73, 70, 
+	70, 70, 11, 1, 70, 0, 13, 85, 
+	79, 79, 13, 1, 79, 1, 13, 79, 
+	1, 1, 0, 1, 0, 1, 0, 29, 
+	130, 127, 127, 127, 29, 29, 127, 0, 
+	1, 0, 1, 0, 1, 0, 1, 1, 
+	1, 0, 1, 0, 1, 0, 1, 0, 
+	1, 0, 1, 0, 1, 0, 1, 0, 
+	1, 0, 1, 0, 1, 0, 1, 0, 
+	1, 0, 1, 0, 1, 0, 1, 0, 
+	1, 0, 1, 0, 1, 0, 37, 1, 
+	1, 0, 1, 1, 0, 0, 0, 0, 
+	0, 0, 39, 0, 0, 0, 39, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 31, 31, 0, 0, 0, 0, 0, 
-	33, 1, 1, 0, 1, 1, 1, 0, 
-	5, 0, 1, 0, 39, 1, 1, 1, 
-	0, 1, 0, 0, 39, 1, 1, 1, 
-	1, 1, 1, 0, 1, 1, 0, 1, 
+	55, 163, 160, 160, 55, 160, 160, 0, 
+	23, 115, 1, 1, 23, 1, 1, 0, 
+	0, 39, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 1, 1, 0, 
+	1, 1, 0, 41, 142, 1, 1, 41, 
+	1, 1, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 31, 31, 0, 0, 0, 
+	0, 0, 33, 1, 1, 1, 0, 1, 
+	1, 1, 0, 5, 0, 1, 0, 39, 
+	1, 1, 1, 0, 1, 0, 0, 39, 
 	1, 1, 1, 1, 1, 1, 0, 1, 
-	0, 25, 25, 25, 25, 121, 118, 118, 
-	25, 118, 118, 118, 0, 0, 0, 1, 
-	0, 0, 1, 1, 0, 7, 1, 1, 
-	1, 1, 1, 1, 0, 39, 1, 1, 
-	0, 1, 0, 1, 0, 19, 109, 19, 
-	109, 109, 0, 0, 1, 0, 1, 1, 
-	0, 15, 97, 91, 91, 15, 91, 1, 
-	15, 91, 1, 1, 0, 25, 25, 25, 
-	25, 121, 118, 1, 118, 25, 118, 118, 
+	1, 0, 1, 1, 1, 1, 1, 1, 
+	1, 0, 1, 0, 25, 25, 25, 25, 
+	121, 118, 118, 118, 25, 118, 118, 118, 
+	0, 0, 0, 1, 0, 0, 1, 1, 
+	0, 7, 1, 1, 1, 1, 1, 1, 
+	0, 39, 1, 1, 0, 1, 0, 1, 
+	0, 19, 109, 109, 19, 109, 109, 0, 
+	0, 1, 1, 0, 1, 1, 0, 15, 
+	97, 91, 91, 15, 1, 91, 1, 15, 
+	91, 1, 1, 0, 25, 25, 25, 25, 
+	121, 118, 118, 1, 118, 25, 118, 118, 
 	118, 0, 3, 0, 1, 1, 0, 0, 
 	0, 0, 0, 39, 1, 1, 1, 0, 
 	1, 0, 0, 39, 1, 1, 1, 1, 
@@ -1273,50 +1300,50 @@ static const unsigned char _querybuilder_trans_actions[] = {
 	0, 1, 0, 9, 67, 61, 61, 1, 
 	61, 9, 1, 61, 0, 1, 0, 11, 
 	76, 70, 70, 70, 11, 1, 70, 0, 
-	13, 88, 79, 79, 13, 79, 1, 13, 
-	79, 1, 1, 0, 1, 0, 1, 0, 
-	29, 133, 127, 127, 127, 29, 29, 127, 
-	0, 1, 0, 1, 0, 1, 0, 1, 
-	1, 1, 0, 1, 0, 1, 0, 1, 
-	0, 1, 0, 1, 0, 1, 0, 1, 
-	0, 1, 0, 1, 0, 1, 0, 1, 
-	0, 1, 0, 1, 0, 1, 0, 1, 
-	0, 1, 0, 1, 0, 1, 0, 1, 
-	0, 0, 0, 1, 0, 0, 59, 0, 
+	13, 88, 79, 79, 13, 1, 79, 1, 
+	13, 79, 1, 1, 0, 1, 0, 1, 
+	0, 29, 133, 127, 127, 127, 29, 29, 
+	127, 0, 1, 0, 1, 0, 1, 0, 
+	1, 1, 1, 0, 1, 0, 1, 0, 
+	1, 0, 1, 0, 1, 0, 1, 0, 
+	1, 0, 1, 0, 1, 0, 1, 0, 
+	1, 0, 1, 0, 1, 0, 1, 0, 
+	1, 0, 1, 0, 1, 0, 1, 0, 
 	1, 0, 0, 0, 1, 0, 0, 59, 
-	0, 1, 0, 0, 0, 0, 1, 0, 
+	0, 1, 0, 0, 0, 1, 0, 0, 
+	59, 0, 1, 0, 0, 0, 0, 1, 
+	0, 0, 0, 59, 0, 0, 0, 0, 
 	0, 0, 59, 0, 0, 0, 0, 0, 
-	0, 59, 0, 0, 0, 0, 0, 59, 
-	0, 0, 0, 0, 59, 0, 0, 0, 
-	59, 0, 0, 59, 0, 0, 1, 1, 
-	1, 1, 0, 0, 0, 0, 59, 0, 
-	0, 0, 0, 0, 0, 59, 0, 1, 
+	59, 0, 0, 0, 0, 59, 0, 0, 
+	0, 59, 0, 0, 59, 0, 0, 1, 
+	1, 1, 1, 0, 0, 0, 0, 59, 
+	0, 0, 0, 0, 0, 0, 59, 0, 
+	1, 1, 1, 1, 1, 1, 0, 1, 
+	1, 0, 1, 1, 1, 1, 0, 1, 
+	1, 1, 0, 1, 59, 0, 1, 1, 
+	1, 1, 1, 0, 1, 0, 1, 1, 
+	1, 1, 0, 0, 1, 59, 0, 1, 
 	1, 1, 1, 1, 1, 0, 1, 1, 
 	0, 1, 1, 1, 1, 0, 1, 1, 
 	1, 0, 1, 59, 0, 1, 1, 1, 
-	1, 1, 0, 1, 0, 1, 1, 1, 
-	1, 0, 0, 1, 59, 0, 1, 1, 
-	1, 1, 1, 1, 0, 1, 1, 0, 
-	1, 1, 1, 1, 0, 1, 1, 1, 
+	1, 1, 1, 0, 1, 1, 0, 1, 
+	1, 1, 1, 0, 1, 1, 1, 0, 
+	1, 59, 0, 1, 1, 1, 1, 1, 
+	0, 1, 0, 1, 1, 1, 1, 0, 
 	0, 1, 59, 0, 1, 1, 1, 1, 
 	1, 1, 0, 1, 1, 0, 1, 1, 
 	1, 1, 0, 1, 1, 1, 0, 1, 
-	59, 0, 1, 1, 1, 1, 1, 0, 
-	1, 0, 1, 1, 1, 1, 0, 0, 
-	1, 59, 0, 1, 1, 1, 1, 1, 
-	1, 0, 1, 1, 0, 1, 1, 1, 
-	1, 0, 1, 1, 1, 0, 1, 59, 
-	0, 1, 0, 0, 0, 0, 1, 0, 
-	0, 0, 59, 0, 1, 0, 0, 0, 
-	0, 1, 0, 0, 0, 59, 0, 1, 
+	59, 0, 1, 0, 0, 0, 0, 1, 
+	0, 0, 0, 59, 0, 1, 0, 0, 
+	0, 0, 1, 0, 0, 0, 59, 0, 
+	1, 1, 1, 1, 1, 1, 0, 1, 
+	1, 0, 1, 1, 1, 1, 0, 1, 
+	1, 1, 0, 1, 59, 0, 1, 1, 
+	1, 1, 1, 0, 1, 0, 1, 1, 
+	1, 1, 0, 0, 1, 59, 0, 1, 
 	1, 1, 1, 1, 1, 0, 1, 1, 
 	0, 1, 1, 1, 1, 0, 1, 1, 
-	1, 0, 1, 59, 0, 1, 1, 1, 
-	1, 1, 0, 1, 0, 1, 1, 1, 
-	1, 0, 0, 1, 59, 0, 1, 1, 
-	1, 1, 1, 1, 0, 1, 1, 0, 
-	1, 1, 1, 1, 0, 1, 1, 1, 
-	0, 1, 59, 0, 0, 0
+	1, 0, 1, 59, 0, 0, 0
 };
 
 static const unsigned char _querybuilder_eof_actions[] = {
@@ -1403,7 +1430,7 @@ static const int querybuilder_en_clause_p = 450;
 static const int querybuilder_en_main = 1;
 
 
-#line 369 "querybuilder_ext.rl"
+#line 371 "querybuilder_ext.rl"
 
 #define CLAUSE_RELATION    1
 #define CLAUSE_PARENTHESIS 2
@@ -1426,6 +1453,7 @@ VALUE rb_parse(VALUE self, VALUE arg) {
   const char * data = RSTRING_PTR(tmp);
 
   int cs;
+  int par_count = 0;
   const char * p     = data;
   const char * pe    = data + RSTRING_LEN(tmp);
   const char * eof   = pe;
@@ -1443,14 +1471,14 @@ VALUE rb_parse(VALUE self, VALUE arg) {
 
 
   
-#line 1447 "querybuilder_ext.c"
+#line 1475 "querybuilder_ext.c"
 	{
 	cs = querybuilder_start;
 	}
 
-#line 408 "querybuilder_ext.rl"
+#line 411 "querybuilder_ext.rl"
   
-#line 1454 "querybuilder_ext.c"
+#line 1482 "querybuilder_ext.c"
 	{
 	int _klen;
 	unsigned int _trans;
@@ -1657,6 +1685,7 @@ _match:
 #line 210 "querybuilder_ext.rl"
 	{
     // # remember current machine state 'cs'
+    par_count = par_count + 1;
     // last << [:par, cs]
     tmp = rb_ary_new();
     rb_ary_push(tmp, _par);
@@ -1670,11 +1699,12 @@ _match:
   }
 	break;
 	case 17:
-#line 224 "querybuilder_ext.rl"
+#line 225 "querybuilder_ext.rl"
 	{
     // pop_stack(stack, :par_close)
     rb_funcall(self, _pop_stack, 2, stack, _par_close);
     // # reset machine state 'cs'
+    par_count = par_count - 1;
     // cs = stack.last.delete_at(1)
     tmp = rb_ary_entry(stack, -1);
     tmp = rb_ary_delete_at(tmp, 1);
@@ -1689,7 +1719,7 @@ _match:
   }
 	break;
 	case 18:
-#line 241 "querybuilder_ext.rl"
+#line 243 "querybuilder_ext.rl"
 	{
     clause_state = CLAUSE_PARENTHESIS;
     // # remember current machine state 'cs'
@@ -1706,7 +1736,7 @@ _match:
   }
 	break;
 	case 19:
-#line 256 "querybuilder_ext.rl"
+#line 258 "querybuilder_ext.rl"
 	{
     clause_state = CLAUSE_RELATION;
     // pop_stack(stack, :clause_par_close)
@@ -1726,7 +1756,7 @@ _match:
   }
 	break;
 	case 20:
-#line 274 "querybuilder_ext.rl"
+#line 276 "querybuilder_ext.rl"
 	{
     // last = apply_op(stack, :scope)
     APPLY_OP(_scope);
@@ -1736,7 +1766,7 @@ _match:
   }
 	break;
 	case 21:
-#line 282 "querybuilder_ext.rl"
+#line 284 "querybuilder_ext.rl"
 	{
     // last = apply_op(stack, :offset)
     APPLY_OP(_offset);
@@ -1745,7 +1775,7 @@ _match:
   }
 	break;
 	case 22:
-#line 289 "querybuilder_ext.rl"
+#line 291 "querybuilder_ext.rl"
 	{
     // last << [:param, str_buf]
     SET_TMP_ARY(_param);
@@ -1753,7 +1783,7 @@ _match:
   }
 	break;
 	case 23:
-#line 295 "querybuilder_ext.rl"
+#line 297 "querybuilder_ext.rl"
 	{
     // last = apply_op(stack, :paginate)
     APPLY_OP(_paginate);
@@ -1762,7 +1792,7 @@ _match:
   }
 	break;
 	case 24:
-#line 302 "querybuilder_ext.rl"
+#line 304 "querybuilder_ext.rl"
 	{
     // last = apply_op(stack, :limit)
     APPLY_OP(_limit);
@@ -1771,7 +1801,7 @@ _match:
   }
 	break;
 	case 25:
-#line 309 "querybuilder_ext.rl"
+#line 311 "querybuilder_ext.rl"
 	{
     // last = apply_op(stack, :order)
     APPLY_OP(_order);
@@ -1780,7 +1810,7 @@ _match:
   }
 	break;
 	case 26:
-#line 316 "querybuilder_ext.rl"
+#line 318 "querybuilder_ext.rl"
 	{
     // last = apply_op(stack, :group)
     APPLY_OP(_group);
@@ -1789,7 +1819,7 @@ _match:
   }
 	break;
 	case 27:
-#line 323 "querybuilder_ext.rl"
+#line 325 "querybuilder_ext.rl"
 	{
     // last = apply_op(stack, :from)
     APPLY_OP(_from);
@@ -1799,7 +1829,7 @@ _match:
   }
 	break;
 	case 28:
-#line 331 "querybuilder_ext.rl"
+#line 333 "querybuilder_ext.rl"
 	{
     // if clause_state == :relation
     //   last = apply_op(stack, "clause_#{str_buf}".to_sym)
@@ -1816,7 +1846,7 @@ _match:
   }
 	break;
 	case 29:
-#line 354 "querybuilder_ext.rl"
+#line 356 "querybuilder_ext.rl"
 	{
     p = p - 3;
     if (p < data) p = data;
@@ -1824,7 +1854,7 @@ _match:
     rb_raise(rb_SyntaxError, "Syntax error near %s.", RSTRING_PTR(rb_str_inspect(rb_str_new(p , pe - p - 1))));
   }
 	break;
-#line 1828 "querybuilder_ext.c"
+#line 1858 "querybuilder_ext.c"
 		}
 	}
 
@@ -1841,7 +1871,7 @@ _again:
 	while ( __nacts-- > 0 ) {
 		switch ( *__acts++ ) {
 	case 29:
-#line 354 "querybuilder_ext.rl"
+#line 356 "querybuilder_ext.rl"
 	{
     p = p - 3;
     if (p < data) p = data;
@@ -1849,7 +1879,7 @@ _again:
     rb_raise(rb_SyntaxError, "Syntax error near %s.", RSTRING_PTR(rb_str_inspect(rb_str_new(p , pe - p - 1))));
   }
 	break;
-#line 1853 "querybuilder_ext.c"
+#line 1883 "querybuilder_ext.c"
 		}
 	}
 	}
@@ -1857,14 +1887,19 @@ _again:
 	_out: {}
 	}
 
-#line 409 "querybuilder_ext.rl"
+#line 412 "querybuilder_ext.rl"
 
-  // raise QueryBuilder::SyntaxError.new("Syntax error near #{data[p..-1].chomp.inspect}.") if p != pe
+  // raise QueryBuilder::SyntaxError.new("Syntax error near #{data[p..-2].inspect}.") if p != pe
   if (p < pe) {
     p = p - 3;
     if (p < data) p = data;
     rb_raise(rb_SyntaxError, "Syntax error near %s.", RSTRING_PTR(rb_str_inspect(rb_str_new(p , pe - p - 1))));
   }
 
+  if (par_count > 0) {
+    // raise QueryBuilder::SyntaxError.new("Missing closing parenthesis in #{data[0..-2].inspect}.")
+    rb_raise(rb_SyntaxError, "Missing closing parenthesis in %s.", RSTRING_PTR(rb_str_inspect(rb_str_new(data , pe - data - 1))));
+  }
+
   return rb_ary_entry(stack, 0);
 }