querybuilder 0.8.2 → 0.8.3

data/History.txt

@@ -1,3 +1,9 @@
+== 0.8.3 2010-08-31
+
+* 2 Major enhancements
+  * Added support for "in ()" and "not in ()" clauses in filters.
+  * Compilation of the parser extension in C by using extconf.rb in gem.
+
 == 0.8.2 2010-08-30
 
 * 1 Major enhancement

data/Rakefile

@@ -19,6 +19,7 @@ begin
     gem.add_dependency "rubyless", ">= 0.5.0"
     gem.add_development_dependency "shoulda", ">= 0"
     gem.add_development_dependency "yamltest", ">= 0.5.0"
+    gem.extensions << 'lib/extconf.rb'
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/lib/query_builder/info.rb

@@ -1,3 +1,3 @@
 module QueryBuilder
-  VERSION = '0.8.2'
+  VERSION = '0.8.3'
 end

data/lib/query_builder/parser.rb

@@ -60,7 +60,7 @@ module QueryBuilder
       end
 
       def pop_stack(stack, op)
-        # debug_stack(stack, op)
+        #debug_stack(stack, op)
         stack_op = stack.last.first
         while OP_PRECEDENCE[op] <= OP_PRECEDENCE[stack_op]
           stack.pop

data/lib/query_builder/processor.rb

@@ -501,9 +501,20 @@ module QueryBuilder
         expr.upcase
       end
 
+      def process_in(*args)
+        field  = process args.shift
+        values = args.map {|val| process(val)}
+        "#{field} IN (#{values.join(',')})"
+      end
+
       def process_not(expr)
         if expr.first == :like
           "#{this.process(expr[1])} NOT LIKE #{this.process(expr[2])}"
+        elsif expr.first == :in
+          args = expr[1..-1]
+          field  = process args.shift
+          values = args.map {|val| process(val)}
+          "#{field} NOT IN (#{values.join(',')})"
         else
           "NOT #{this.process(expr)}"
         end

data/lib/querybuilder_ext.c

@@ -19,6 +19,7 @@ static VALUE _raw;
 static VALUE _function;
 static VALUE _relation;
 static VALUE _is;
+static VALUE _in;
 static VALUE _interval;
 static VALUE _scope;
 static VALUE _filter;
@@ -68,6 +69,7 @@ void Init_querybuilder_ext() {
   STORE_SYM(function);
   STORE_SYM(relation);
   STORE_SYM(is);
+  STORE_SYM(in);
   STORE_SYM(interval);
   STORE_SYM(scope);
   STORE_SYM(filter);
@@ -108,11 +110,11 @@ void Init_querybuilder_ext() {
 #define APPLY_OP(elem) last = rb_funcall(self, _apply_op, 2, stack, elem);
 
 
-#line 368 "querybuilder_ext.rl"
+#line 375 "querybuilder_ext.rl"
 
 
 
-#line 116 "querybuilder_ext.c"
+#line 118 "querybuilder_ext.c"
 static const char _querybuilder_actions[] = {
 	0, 1, 0, 1, 1, 1, 2, 1, 
 	3, 1, 4, 1, 5, 1, 6, 1, 
@@ -121,21 +123,21 @@ static const char _querybuilder_actions[] = {
 	15, 1, 16, 1, 17, 1, 18, 1, 
 	19, 1, 20, 1, 21, 1, 22, 1, 
 	23, 1, 24, 1, 25, 1, 26, 1, 
-	27, 1, 28, 1, 29, 2, 4, 0, 
-	2, 4, 17, 2, 4, 19, 2, 5, 
-	0, 2, 5, 17, 2, 5, 19, 2, 
-	6, 0, 2, 6, 11, 2, 6, 17, 
-	2, 6, 19, 2, 7, 0, 2, 7, 
-	17, 2, 7, 19, 2, 8, 0, 2, 
-	8, 17, 2, 8, 19, 2, 9, 0, 
-	2, 11, 6, 2, 11, 19, 2, 12, 
-	0, 2, 12, 16, 2, 12, 28, 2, 
-	14, 0, 2, 14, 17, 2, 14, 19, 
-	2, 16, 18, 2, 18, 16, 2, 20, 
-	19, 2, 21, 0, 2, 23, 0, 2, 
-	24, 0, 2, 25, 0, 2, 26, 0, 
-	2, 27, 0, 2, 27, 18, 2, 28, 
-	12
+	27, 1, 28, 1, 29, 1, 30, 2, 
+	4, 0, 2, 4, 18, 2, 4, 20, 
+	2, 5, 0, 2, 5, 18, 2, 5, 
+	20, 2, 6, 0, 2, 6, 11, 2, 
+	6, 18, 2, 6, 20, 2, 7, 0, 
+	2, 7, 18, 2, 7, 20, 2, 8, 
+	0, 2, 8, 18, 2, 8, 20, 2, 
+	9, 0, 2, 11, 6, 2, 11, 20, 
+	2, 12, 0, 2, 12, 17, 2, 12, 
+	29, 2, 13, 0, 2, 15, 0, 2, 
+	15, 18, 2, 15, 20, 2, 17, 19, 
+	2, 19, 17, 2, 21, 20, 2, 22, 
+	0, 2, 24, 0, 2, 25, 0, 2, 
+	26, 0, 2, 27, 0, 2, 28, 0, 
+	2, 28, 19, 2, 29, 12
 };
 
 static const short _querybuilder_key_offsets[] = {
@@ -155,62 +157,78 @@ static const short _querybuilder_key_offsets[] = {
 	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
+	560, 564, 574, 583, 592, 594, 599, 599, 
+	600, 603, 606, 608, 608, 608, 614, 623, 
+	632, 644, 646, 646, 648, 656, 658, 665, 
+	668, 673, 674, 675, 676, 684, 686, 687, 
+	690, 695, 696, 697, 700, 702, 703, 706, 
+	707, 708, 709, 710, 711, 712, 713, 714, 
+	715, 716, 718, 719, 722, 727, 728, 732, 
+	733, 734, 736, 740, 741, 742, 743, 744, 
+	745, 747, 748, 749, 750, 751, 752, 755, 
+	771, 773, 781, 797, 798, 801, 804, 806, 
+	806, 806, 815, 824, 833, 848, 865, 867, 
+	867, 871, 879, 880, 881, 884, 900, 902, 
+	913, 915, 925, 940, 941, 942, 951, 952, 
+	955, 958, 959, 960, 961, 963, 967, 977, 
+	986, 995, 997, 1002, 1002, 1003, 1006, 1009, 
+	1011, 1011, 1011, 1017, 1026, 1035, 1047, 1049, 
+	1049, 1051, 1059, 1061, 1068, 1071, 1076, 1077, 
+	1078, 1079, 1087, 1089, 1090, 1093, 1098, 1099, 
+	1100, 1103, 1105, 1106, 1109, 1110, 1111, 1112, 
+	1113, 1114, 1115, 1116, 1117, 1118, 1119, 1121, 
+	1122, 1125, 1130, 1131, 1135, 1136, 1137, 1139, 
+	1143, 1144, 1145, 1146, 1147, 1148, 1150, 1151, 
+	1152, 1153, 1154, 1155, 1170, 1171, 1171, 1172, 
+	1173, 1174, 1189, 1190, 1190, 1199, 1200, 1201, 
+	1202, 1203, 1213, 1222, 1223, 1226, 1235, 1244, 
+	1245, 1246, 1247, 1248, 1251, 1267, 1269, 1277, 
+	1293, 1294, 1297, 1300, 1302, 1302, 1302, 1311, 
+	1320, 1329, 1344, 1361, 1363, 1363, 1367, 1375, 
+	1376, 1377, 1380, 1396, 1398, 1409, 1411, 1421, 
+	1436, 1437, 1438, 1447, 1448, 1451, 1454, 1455, 
+	1456, 1457, 1459, 1463, 1473, 1482, 1491, 1493, 
+	1498, 1498, 1499, 1502, 1505, 1507, 1507, 1507, 
+	1513, 1522, 1531, 1543, 1545, 1545, 1547, 1555, 
+	1557, 1564, 1567, 1572, 1573, 1574, 1575, 1583, 
+	1585, 1586, 1589, 1594, 1595, 1596, 1599, 1601, 
+	1602, 1605, 1606, 1607, 1608, 1609, 1610, 1611, 
+	1612, 1613, 1614, 1615, 1617, 1618, 1621, 1626, 
+	1627, 1631, 1632, 1633, 1635, 1639, 1640, 1641, 
+	1642, 1643, 1644, 1646, 1647, 1648, 1649, 1650, 
+	1651, 1666, 1667, 1667, 1683, 1685, 1694, 1716, 
+	1732, 1733, 1736, 1739, 1741, 1741, 1741, 1751, 
+	1760, 1769, 1785, 1802, 1804, 1804, 1808, 1817, 
+	1834, 1835, 1836, 1839, 1840, 1842, 1844, 1848, 
+	1857, 1866, 1868, 1873, 1873, 1874, 1877, 1880, 
+	1882, 1882, 1882, 1888, 1897, 1906, 1918, 1920, 
+	1920, 1922, 1930, 1932, 1939, 1942, 1947, 1948, 
+	1949, 1950, 1959, 1961, 1962, 1965, 1970, 1971, 
+	1972, 1975, 1976, 1977, 1978, 1979, 1980, 1981, 
+	1983, 1984, 1987, 1992, 1993, 1994, 1995, 1997, 
+	2009, 2011, 2022, 2038, 2039, 2040, 2050, 2051, 
+	2052, 2053, 2056, 2057, 2058, 2059, 2060, 2061, 
+	2062, 2063, 2064, 2065, 2066, 2067, 2068, 2069, 
+	2070, 2071, 2072, 2073, 2073, 2083, 2087, 2091, 
+	2096, 2097, 2098, 2099, 2109, 2119, 2126, 2127, 
+	2130, 2139, 2149, 2150, 2151, 2152, 2153, 2156, 
+	2172, 2174, 2183, 2206, 2222, 2223, 2226, 2229, 
+	2231, 2231, 2231, 2241, 2250, 2259, 2275, 2292, 
+	2294, 2294, 2298, 2307, 2325, 2326, 2327, 2330, 
+	2331, 2333, 2335, 2339, 2349, 2358, 2367, 2369, 
+	2374, 2374, 2375, 2378, 2381, 2383, 2383, 2383, 
+	2389, 2398, 2407, 2419, 2421, 2421, 2423, 2431, 
+	2433, 2440, 2443, 2448, 2449, 2450, 2451, 2460, 
+	2462, 2463, 2466, 2471, 2472, 2473, 2476, 2477, 
+	2478, 2479, 2480, 2481, 2482, 2484, 2485, 2488, 
+	2493, 2494, 2498, 2499, 2500, 2502, 2514, 2516, 
+	2527, 2543, 2544, 2545, 2555, 2556, 2557, 2558, 
+	2561, 2562, 2563, 2564, 2565, 2566, 2567, 2568, 
+	2569, 2570, 2571, 2572, 2573, 2574, 2575, 2576, 
+	2577, 2578, 2578, 2587, 2596, 2607, 2614, 2620, 
+	2625, 2629, 2632, 2643, 2650, 2673, 2691, 2714, 
+	2737, 2755, 2778, 2789, 2800, 2823, 2841, 2864, 
+	2864
 };
 
 static const char _querybuilder_trans_keys[] = {
@@ -284,131 +302,248 @@ static const char _querybuilder_trans_keys[] = {
 	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, 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, 
+	32, 40, 9, 10, 32, 40, 58, 95, 
+	9, 10, 65, 90, 97, 122, 32, 34, 
+	35, 39, 45, 9, 10, 48, 57, 32, 
+	34, 35, 39, 45, 9, 10, 48, 57, 
+	34, 92, 32, 41, 44, 9, 10, 123, 
+	34, 92, 125, 34, 92, 125, 34, 92, 
+	32, 41, 44, 46, 9, 10, 32, 58, 
+	95, 9, 10, 65, 90, 97, 122, 32, 
+	58, 95, 9, 10, 65, 90, 97, 122, 
+	32, 41, 44, 46, 58, 95, 9, 10, 
+	65, 90, 97, 122, 39, 92, 48, 57, 
+	32, 41, 44, 46, 9, 10, 48, 57, 
+	48, 57, 32, 41, 44, 9, 10, 48, 
+	57, 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, 105, 108, 9, 10, 110, 
+	32, 40, 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, 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, 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, 
+	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, 40, 9, 10, 32, 
+	40, 58, 95, 9, 10, 65, 90, 97, 
+	122, 32, 34, 35, 39, 45, 9, 10, 
+	48, 57, 32, 34, 35, 39, 45, 9, 
+	10, 48, 57, 34, 92, 32, 41, 44, 
+	9, 10, 123, 34, 92, 125, 34, 92, 
+	125, 34, 92, 32, 41, 44, 46, 9, 
+	10, 32, 58, 95, 9, 10, 65, 90, 
+	97, 122, 32, 58, 95, 9, 10, 65, 
+	90, 97, 122, 32, 41, 44, 46, 58, 
+	95, 9, 10, 65, 90, 97, 122, 39, 
+	92, 48, 57, 32, 41, 44, 46, 9, 
+	10, 48, 57, 48, 57, 32, 41, 44, 
+	9, 10, 48, 57, 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, 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, 
+	111, 116, 32, 9, 10, 32, 105, 108, 
+	9, 10, 110, 32, 40, 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, 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, 104, 101, 
-	114, 101, 32, 9, 10, 32, 34, 35, 
+	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, 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, 
+	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, 40, 9, 10, 32, 
+	40, 58, 95, 9, 10, 65, 90, 97, 
+	122, 32, 34, 35, 39, 45, 9, 10, 
+	48, 57, 32, 34, 35, 39, 45, 9, 
+	10, 48, 57, 34, 92, 32, 41, 44, 
+	9, 10, 123, 34, 92, 125, 34, 92, 
+	125, 34, 92, 32, 41, 44, 46, 9, 
+	10, 32, 58, 95, 9, 10, 65, 90, 
 	97, 122, 32, 58, 95, 9, 10, 65, 
-	90, 97, 122, 32, 43, 45, 46, 58, 
+	90, 97, 122, 32, 41, 44, 46, 58, 
+	95, 9, 10, 65, 90, 97, 122, 39, 
+	92, 48, 57, 32, 41, 44, 46, 9, 
+	10, 48, 57, 48, 57, 32, 41, 44, 
+	9, 10, 48, 57, 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, 105, 108, 
+	9, 10, 110, 32, 40, 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, 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, 
+	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, 110, 115, 32, 40, 9, 10, 
+	32, 34, 35, 39, 45, 9, 10, 48, 
+	57, 32, 34, 35, 39, 45, 9, 10, 
+	48, 57, 34, 92, 32, 41, 44, 9, 
+	10, 123, 34, 92, 125, 34, 92, 125, 
+	34, 92, 32, 41, 44, 46, 9, 10, 
+	32, 58, 95, 9, 10, 65, 90, 97, 
+	122, 32, 58, 95, 9, 10, 65, 90, 
+	97, 122, 32, 41, 44, 46, 58, 95, 
+	9, 10, 65, 90, 97, 122, 39, 92, 
+	48, 57, 32, 41, 44, 46, 9, 10, 
+	48, 57, 48, 57, 32, 41, 44, 9, 
+	10, 48, 57, 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, 105, 108, 9, 10, 
+	110, 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, 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, 
+	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, 58, 
+	95, 9, 10, 65, 90, 97, 122, 32, 
+	41, 102, 105, 119, 9, 10, 110, 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, 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, 
+	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, 102, 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, 113, 101, 116, 110, 115, 32, 
+	40, 9, 10, 32, 40, 58, 95, 9, 
+	10, 65, 90, 97, 122, 32, 34, 35, 
+	39, 45, 9, 10, 48, 57, 32, 34, 
+	35, 39, 45, 9, 10, 48, 57, 34, 
+	92, 32, 41, 44, 9, 10, 123, 34, 
+	92, 125, 34, 92, 125, 34, 92, 32, 
+	41, 44, 46, 9, 10, 32, 58, 95, 
+	9, 10, 65, 90, 97, 122, 32, 58, 
+	95, 9, 10, 65, 90, 97, 122, 32, 
+	41, 44, 46, 58, 95, 9, 10, 65, 
+	90, 97, 122, 39, 92, 48, 57, 32, 
+	41, 44, 46, 9, 10, 48, 57, 48, 
+	57, 32, 41, 44, 9, 10, 48, 57, 
+	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, 105, 108, 9, 10, 110, 32, 40, 
 	9, 10, 105, 114, 48, 57, 32, 41, 
 	43, 45, 46, 61, 9, 10, 48, 57, 
 	60, 62, 48, 57, 32, 41, 43, 45, 
@@ -419,83 +554,15 @@ static const char _querybuilder_trans_keys[] = {
 	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, 
-	58, 95, 9, 10, 65, 90, 97, 122, 
-	32, 41, 102, 105, 119, 9, 10, 110, 
-	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, 
-	61, 97, 101, 102, 103, 105, 108, 109, 
-	110, 111, 9, 10, 60, 62, 110, 100, 
-	32, 9, 10, 113, 101, 116, 110, 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, 97, 102, 103, 
-	108, 111, 112, 9, 10, 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, 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, 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, 
+	101, 97, 32, 97, 102, 103, 108, 111, 
+	112, 9, 10, 32, 97, 102, 103, 108, 
+	111, 112, 9, 10, 32, 97, 102, 103, 
 	105, 108, 111, 112, 119, 9, 10, 32, 
-	97, 102, 103, 105, 108, 111, 112, 119, 
+	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, 
@@ -504,7 +571,26 @@ static const char _querybuilder_trans_keys[] = {
 	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
+	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, 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, 101, 
+	102, 103, 104, 105, 108, 109, 110, 111, 
+	112, 115, 119, 121, 9, 10, 60, 62, 
+	0
 };
 
 static const char _querybuilder_single_lengths[] = {
@@ -524,62 +610,78 @@ static const char _querybuilder_single_lengths[] = {
 	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, 
+	2, 4, 5, 5, 2, 3, 0, 1, 
+	3, 3, 2, 0, 0, 4, 3, 3, 
+	6, 2, 0, 0, 4, 0, 3, 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, 1, 2, 1, 1, 2, 1, 1, 
-	2, 2, 1, 1, 1, 1, 1, 2, 
-	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, 2, 1, 1, 3, 1, 2, 1, 
+	1, 2, 2, 1, 1, 1, 1, 1, 
+	2, 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, 2, 4, 5, 
+	5, 2, 3, 0, 1, 3, 3, 2, 
+	0, 0, 4, 3, 3, 6, 2, 0, 
+	0, 4, 0, 3, 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, 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, 3, 1, 2, 1, 1, 2, 2, 
+	1, 1, 1, 1, 1, 2, 1, 1, 
+	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, 2, 4, 5, 5, 2, 3, 
+	0, 1, 3, 3, 2, 0, 0, 4, 
+	3, 3, 6, 2, 0, 0, 4, 0, 
+	3, 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, 3, 1, 
+	2, 1, 1, 2, 2, 1, 1, 1, 
+	1, 1, 2, 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, 2, 2, 5, 
+	5, 2, 3, 0, 1, 3, 3, 2, 
+	0, 0, 4, 3, 3, 6, 2, 0, 
+	0, 4, 0, 3, 1, 3, 1, 1, 
+	1, 5, 2, 1, 1, 3, 1, 1, 
+	3, 1, 1, 1, 1, 1, 1, 2, 
+	1, 1, 3, 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, 2, 1, 1, 2, 1, 1, 
-	2, 2, 1, 1, 1, 1, 1, 2, 
-	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, 1, 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, 2, 4, 5, 5, 2, 3, 
+	0, 1, 3, 3, 2, 0, 0, 4, 
+	3, 3, 6, 2, 0, 0, 4, 0, 
+	3, 1, 3, 1, 1, 1, 5, 2, 
+	1, 1, 3, 1, 1, 3, 1, 1, 
+	1, 1, 1, 1, 2, 1, 1, 3, 
 	1, 2, 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, 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, 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, 
-	7, 9, 5, 4, 3, 2, 1, 9, 
-	5, 19, 14, 19, 19, 14, 19, 9, 
-	9, 19, 14, 19, 0, 0
+	1, 0, 7, 7, 9, 5, 4, 3, 
+	2, 1, 9, 5, 19, 14, 19, 19, 
+	14, 19, 9, 9, 19, 14, 19, 0, 
+	0
 };
 
 static const char _querybuilder_range_lengths[] = {
@@ -599,62 +701,78 @@ static const char _querybuilder_range_lengths[] = {
 	4, 0, 0, 1, 2, 0, 0, 1, 
 	4, 1, 3, 1, 3, 4, 0, 0, 
 	2, 0, 1, 0, 0, 0, 0, 0, 
-	1, 1, 0, 0, 0, 2, 0, 0, 
-	1, 1, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 1, 1, 0, 0, 
-	0, 1, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 1, 4, 0, 
-	2, 4, 0, 0, 0, 0, 0, 0, 
-	2, 3, 3, 4, 4, 0, 0, 1, 
-	2, 0, 0, 1, 4, 1, 3, 1, 
-	3, 4, 0, 0, 2, 0, 1, 0, 
-	0, 0, 0, 0, 1, 1, 0, 0, 
+	1, 3, 2, 2, 0, 1, 0, 0, 
+	0, 0, 0, 0, 0, 1, 3, 3, 
+	3, 0, 0, 1, 2, 1, 2, 1, 
+	1, 0, 0, 0, 2, 0, 0, 1, 
+	1, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 1, 1, 0, 1, 0, 
+	0, 0, 1, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 1, 4, 
+	0, 2, 4, 0, 0, 0, 0, 0, 
+	0, 2, 3, 3, 4, 4, 0, 0, 
+	1, 2, 0, 0, 1, 4, 1, 3, 
+	1, 3, 4, 0, 0, 2, 0, 1, 
+	0, 0, 0, 0, 0, 1, 3, 2, 
+	2, 0, 1, 0, 0, 0, 0, 0, 
+	0, 0, 1, 3, 3, 3, 0, 0, 
+	1, 2, 1, 2, 1, 1, 0, 0, 
 	0, 2, 0, 0, 1, 1, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	1, 1, 0, 0, 0, 1, 0, 0, 
+	1, 1, 0, 1, 0, 0, 0, 1, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 4, 0, 0, 0, 0, 0, 4, 
-	0, 0, 3, 0, 0, 0, 0, 3, 
-	3, 0, 1, 3, 3, 0, 0, 0, 
-	0, 1, 4, 0, 2, 4, 0, 0, 
-	0, 0, 0, 0, 2, 3, 3, 4, 
-	4, 0, 0, 1, 2, 0, 0, 1, 
-	4, 1, 3, 1, 3, 4, 0, 0, 
+	0, 0, 0, 4, 0, 0, 0, 0, 
+	0, 4, 0, 0, 3, 0, 0, 0, 
+	0, 3, 3, 0, 1, 3, 3, 0, 
+	0, 0, 0, 1, 4, 0, 2, 4, 
+	0, 0, 0, 0, 0, 0, 2, 3, 
+	3, 4, 4, 0, 0, 1, 2, 0, 
+	0, 1, 4, 1, 3, 1, 3, 4, 
+	0, 0, 2, 0, 1, 0, 0, 0, 
+	0, 0, 1, 3, 2, 2, 0, 1, 
+	0, 0, 0, 0, 0, 0, 0, 1, 
+	3, 3, 3, 0, 0, 1, 2, 1, 
+	2, 1, 1, 0, 0, 0, 2, 0, 
+	0, 1, 1, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 1, 1, 0, 
+	1, 0, 0, 0, 1, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	4, 0, 0, 4, 0, 2, 2, 4, 
+	0, 0, 0, 0, 0, 0, 2, 3, 
+	3, 4, 4, 0, 0, 1, 2, 2, 
+	0, 0, 1, 0, 0, 0, 1, 2, 
 	2, 0, 1, 0, 0, 0, 0, 0, 
-	1, 1, 0, 0, 0, 2, 0, 0, 
-	1, 1, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 1, 1, 0, 0, 
-	0, 1, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 4, 0, 0, 
-	4, 0, 2, 2, 4, 0, 0, 0, 
-	0, 0, 0, 2, 3, 3, 4, 4, 
-	0, 0, 1, 2, 2, 0, 0, 1, 
-	0, 0, 0, 1, 1, 0, 0, 0, 
-	2, 0, 0, 1, 1, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
-	1, 1, 0, 0, 1, 3, 1, 3, 
-	4, 0, 0, 2, 0, 0, 0, 0, 
+	0, 0, 1, 3, 3, 3, 0, 0, 
+	1, 2, 1, 2, 1, 1, 0, 0, 
+	0, 2, 0, 0, 1, 1, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 1, 1, 0, 0, 0, 1, 3, 
+	1, 3, 4, 0, 0, 2, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 3, 1, 1, 1, 0, 0, 
-	0, 3, 3, 1, 0, 1, 3, 3, 
-	0, 0, 0, 0, 1, 4, 0, 2, 
-	2, 4, 0, 0, 0, 0, 0, 0, 
-	2, 3, 3, 4, 4, 0, 0, 1, 
-	2, 2, 0, 0, 1, 0, 0, 0, 
-	1, 1, 0, 0, 0, 2, 0, 0, 
-	1, 1, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 1, 1, 0, 
-	0, 1, 3, 1, 3, 4, 0, 0, 
-	2, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 3, 1, 1, 1, 
+	0, 0, 0, 3, 3, 1, 0, 1, 
+	3, 3, 0, 0, 0, 0, 1, 4, 
+	0, 2, 2, 4, 0, 0, 0, 0, 
+	0, 0, 2, 3, 3, 4, 4, 0, 
+	0, 1, 2, 2, 0, 0, 1, 0, 
+	0, 0, 1, 3, 2, 2, 0, 1, 
 	0, 0, 0, 0, 0, 0, 0, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 2, 2, 2, 2, 2, 2, 1, 
-	1, 2, 2, 2, 0, 0
+	3, 3, 3, 0, 0, 1, 2, 1, 
+	2, 1, 1, 0, 0, 0, 2, 0, 
+	0, 1, 1, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 1, 1, 
+	0, 1, 0, 0, 1, 3, 1, 3, 
+	4, 0, 0, 2, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 2, 2, 2, 2, 
+	2, 2, 1, 1, 2, 2, 2, 0, 
+	0
 };
 
 static const short _querybuilder_index_offsets[] = {
@@ -674,533 +792,539 @@ static const short _querybuilder_index_offsets[] = {
 	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
+	540, 544, 552, 560, 568, 571, 576, 577, 
+	579, 583, 587, 590, 591, 592, 598, 605, 
+	612, 622, 625, 626, 628, 635, 637, 643, 
+	646, 651, 653, 655, 657, 664, 667, 669, 
+	672, 677, 679, 681, 685, 688, 690, 694, 
+	696, 698, 700, 702, 704, 706, 708, 710, 
+	712, 714, 717, 719, 722, 727, 729, 733, 
+	735, 737, 740, 744, 746, 748, 750, 752, 
+	754, 757, 759, 761, 763, 765, 767, 770, 
+	783, 786, 793, 806, 808, 812, 816, 819, 
+	820, 821, 829, 836, 843, 855, 869, 872, 
+	873, 877, 884, 886, 888, 891, 904, 906, 
+	915, 917, 925, 937, 939, 941, 949, 951, 
+	954, 958, 960, 962, 964, 967, 971, 979, 
+	987, 995, 998, 1003, 1004, 1006, 1010, 1014, 
+	1017, 1018, 1019, 1025, 1032, 1039, 1049, 1052, 
+	1053, 1055, 1062, 1064, 1070, 1073, 1078, 1080, 
+	1082, 1084, 1091, 1094, 1096, 1099, 1104, 1106, 
+	1108, 1112, 1115, 1117, 1121, 1123, 1125, 1127, 
+	1129, 1131, 1133, 1135, 1137, 1139, 1141, 1144, 
+	1146, 1149, 1154, 1156, 1160, 1162, 1164, 1167, 
+	1171, 1173, 1175, 1177, 1179, 1181, 1184, 1186, 
+	1188, 1190, 1192, 1194, 1206, 1208, 1209, 1211, 
+	1213, 1215, 1227, 1229, 1230, 1237, 1239, 1241, 
+	1243, 1245, 1253, 1260, 1262, 1265, 1272, 1279, 
+	1281, 1283, 1285, 1287, 1290, 1303, 1306, 1313, 
+	1326, 1328, 1332, 1336, 1339, 1340, 1341, 1349, 
+	1356, 1363, 1375, 1389, 1392, 1393, 1397, 1404, 
+	1406, 1408, 1411, 1424, 1426, 1435, 1437, 1445, 
+	1457, 1459, 1461, 1469, 1471, 1474, 1478, 1480, 
+	1482, 1484, 1487, 1491, 1499, 1507, 1515, 1518, 
+	1523, 1524, 1526, 1530, 1534, 1537, 1538, 1539, 
+	1545, 1552, 1559, 1569, 1572, 1573, 1575, 1582, 
+	1584, 1590, 1593, 1598, 1600, 1602, 1604, 1611, 
+	1614, 1616, 1619, 1624, 1626, 1628, 1632, 1635, 
+	1637, 1641, 1643, 1645, 1647, 1649, 1651, 1653, 
+	1655, 1657, 1659, 1661, 1664, 1666, 1669, 1674, 
+	1676, 1680, 1682, 1684, 1687, 1691, 1693, 1695, 
+	1697, 1699, 1701, 1704, 1706, 1708, 1710, 1712, 
+	1714, 1726, 1728, 1729, 1742, 1745, 1753, 1774, 
+	1787, 1789, 1793, 1797, 1800, 1801, 1802, 1811, 
+	1818, 1825, 1838, 1852, 1855, 1856, 1860, 1868, 
+	1884, 1886, 1888, 1891, 1893, 1896, 1899, 1903, 
+	1911, 1919, 1922, 1927, 1928, 1930, 1934, 1938, 
+	1941, 1942, 1943, 1949, 1956, 1963, 1973, 1976, 
+	1977, 1979, 1986, 1988, 1994, 1997, 2002, 2004, 
+	2006, 2008, 2016, 2019, 2021, 2024, 2029, 2031, 
+	2033, 2037, 2039, 2041, 2043, 2045, 2047, 2049, 
+	2052, 2054, 2057, 2062, 2064, 2066, 2068, 2070, 
+	2080, 2082, 2091, 2104, 2106, 2108, 2117, 2119, 
+	2121, 2123, 2127, 2129, 2131, 2133, 2135, 2137, 
+	2139, 2141, 2143, 2145, 2147, 2149, 2151, 2153, 
+	2155, 2157, 2159, 2161, 2162, 2170, 2174, 2178, 
+	2183, 2185, 2187, 2189, 2197, 2205, 2212, 2214, 
+	2217, 2224, 2232, 2234, 2236, 2238, 2240, 2243, 
+	2256, 2259, 2267, 2289, 2302, 2304, 2308, 2312, 
+	2315, 2316, 2317, 2326, 2333, 2340, 2353, 2367, 
+	2370, 2371, 2375, 2383, 2400, 2402, 2404, 2407, 
+	2409, 2412, 2415, 2419, 2427, 2435, 2443, 2446, 
+	2451, 2452, 2454, 2458, 2462, 2465, 2466, 2467, 
+	2473, 2480, 2487, 2497, 2500, 2501, 2503, 2510, 
+	2512, 2518, 2521, 2526, 2528, 2530, 2532, 2540, 
+	2543, 2545, 2548, 2553, 2555, 2557, 2561, 2563, 
+	2565, 2567, 2569, 2571, 2573, 2576, 2578, 2581, 
+	2586, 2588, 2592, 2594, 2596, 2598, 2608, 2610, 
+	2619, 2632, 2634, 2636, 2645, 2647, 2649, 2651, 
+	2655, 2657, 2659, 2661, 2663, 2665, 2667, 2669, 
+	2671, 2673, 2675, 2677, 2679, 2681, 2683, 2685, 
+	2687, 2689, 2690, 2699, 2708, 2719, 2726, 2732, 
+	2737, 2741, 2744, 2755, 2762, 2784, 2801, 2823, 
+	2845, 2862, 2884, 2895, 2906, 2928, 2945, 2967, 
+	2968
 };
 
 static const short _querybuilder_trans_targs[] = {
-	1, 2, 272, 272, 1, 272, 272, 0, 
-	2, 3, 2, 0, 551, 551, 0, 5, 
+	1, 2, 322, 322, 1, 322, 322, 0, 
+	2, 3, 2, 0, 674, 674, 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, 
+	316, 316, 7, 316, 316, 0, 8, 9, 
+	8, 0, 675, 675, 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, 15, 0, 676, 15, 15, 676, 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, 
+	0, 677, 24, 76, 25, 25, 677, 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, 
-	555, 33, 0, 34, 35, 34, 36, 0, 
-	36, 0, 556, 556, 36, 0, 38, 0, 
+	32, 31, 33, 0, 33, 0, 678, 34, 
+	678, 33, 0, 34, 35, 34, 36, 0, 
+	36, 0, 679, 679, 36, 0, 38, 0, 
 	39, 0, 40, 0, 41, 0, 42, 0, 
 	43, 44, 43, 45, 0, 43, 44, 43, 
-	45, 0, 45, 0, 557, 557, 45, 0, 
+	45, 0, 45, 0, 680, 680, 45, 0, 
 	47, 0, 48, 0, 49, 0, 50, 0, 
 	51, 0, 52, 0, 53, 0, 54, 55, 
 	55, 54, 55, 55, 0, 54, 55, 55, 
-	54, 55, 55, 0, 558, 55, 55, 558, 
+	54, 55, 55, 0, 681, 55, 55, 681, 
 	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, 
+	65, 65, 0, 682, 64, 73, 65, 65, 
+	682, 65, 65, 0, 67, 0, 68, 0, 
+	683, 64, 683, 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, 0, 682, 64, 73, 75, 75, 682, 
 	75, 75, 0, 77, 78, 78, 77, 78, 
 	78, 0, 77, 78, 78, 77, 78, 78, 
-	0, 554, 24, 76, 78, 78, 554, 78, 
+	0, 677, 24, 76, 78, 78, 677, 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, 
+	82, 82, 81, 82, 82, 0, 675, 82, 
+	82, 675, 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, 
+	91, 94, 105, 107, 113, 313, 313, 90, 
+	114, 313, 313, 0, 92, 315, 91, 684, 
+	93, 93, 93, 684, 104, 0, 90, 91, 
+	94, 105, 107, 113, 313, 313, 90, 114, 
+	313, 313, 0, 95, 0, 97, 99, 0, 
 	96, 97, 99, 100, 96, 96, 98, 97, 
-	97, 96, 561, 93, 93, 101, 93, 561, 
+	97, 96, 684, 93, 93, 101, 93, 684, 
 	104, 0, 102, 103, 103, 102, 103, 103, 
 	0, 102, 103, 103, 102, 103, 103, 0, 
-	561, 93, 93, 101, 103, 93, 103, 561, 
+	684, 93, 93, 101, 103, 93, 103, 684, 
 	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, 
+	107, 113, 313, 93, 313, 90, 114, 313, 
+	313, 0, 92, 106, 105, 105, 107, 108, 
+	107, 0, 685, 93, 93, 93, 685, 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, 
+	112, 114, 117, 117, 0, 114, 0, 684, 
+	93, 93, 115, 93, 684, 114, 104, 0, 
+	116, 0, 684, 93, 93, 93, 684, 116, 
+	104, 0, 686, 93, 93, 101, 117, 93, 
+	117, 686, 104, 117, 117, 0, 119, 0, 
+	120, 0, 685, 93, 93, 93, 108, 685, 
 	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, 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, 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, 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, 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, 
-	493, 454, 494, 495, 508, 511, 515, 520, 
-	489, 484, 0, 491, 0, 492, 0, 469, 
-	469, 0, 492, 0, 492, 492, 0, 461, 
-	496, 0, 497, 497, 0, 497, 498, 502, 
-	497, 0, 499, 0, 500, 0, 501, 0, 
-	489, 573, 473, 473, 473, 489, 484, 0, 
-	503, 506, 0, 504, 0, 505, 505, 0, 
-	505, 498, 502, 505, 0, 507, 0, 501, 
-	0, 492, 509, 492, 0, 510, 0, 492, 
-	0, 512, 0, 513, 0, 514, 0, 492, 
-	0, 492, 516, 0, 517, 0, 518, 518, 
-	0, 518, 519, 518, 0, 509, 0, 492, 
-	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, 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, 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, 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, 359, 
-	362, 571, 296, 0, 0, 0, 0
+	0, 128, 151, 0, 129, 130, 129, 0, 
+	129, 130, 82, 82, 129, 82, 82, 0, 
+	131, 132, 135, 145, 147, 131, 148, 0, 
+	131, 132, 135, 145, 147, 131, 148, 0, 
+	133, 134, 132, 133, 108, 131, 133, 0, 
+	132, 136, 0, 138, 140, 0, 137, 138, 
+	140, 141, 137, 137, 139, 138, 138, 137, 
+	133, 108, 131, 142, 133, 0, 143, 144, 
+	144, 143, 144, 144, 0, 143, 144, 144, 
+	143, 144, 144, 0, 133, 108, 131, 142, 
+	144, 144, 133, 144, 144, 0, 133, 146, 
+	145, 145, 148, 0, 133, 108, 131, 149, 
+	133, 148, 0, 150, 0, 133, 108, 131, 
+	133, 150, 0, 152, 152, 0, 152, 153, 
+	157, 152, 0, 154, 0, 155, 0, 156, 
+	0, 685, 93, 93, 93, 685, 104, 0, 
+	158, 161, 0, 159, 0, 160, 160, 0, 
+	160, 153, 157, 160, 0, 162, 0, 156, 
+	0, 122, 164, 122, 0, 165, 28, 0, 
+	122, 0, 167, 170, 174, 0, 168, 0, 
+	169, 0, 122, 0, 171, 0, 172, 0, 
+	173, 0, 120, 0, 175, 0, 176, 0, 
+	120, 0, 122, 178, 0, 179, 0, 180, 
+	180, 0, 180, 181, 183, 180, 0, 182, 
+	0, 182, 130, 182, 0, 184, 0, 165, 
+	0, 38, 186, 0, 112, 58, 112, 0, 
+	188, 0, 189, 0, 190, 0, 191, 0, 
+	120, 0, 193, 195, 0, 194, 0, 120, 
+	0, 196, 0, 197, 0, 198, 0, 199, 
+	199, 0, 199, 200, 203, 214, 216, 222, 
+	307, 307, 199, 223, 307, 307, 0, 201, 
+	309, 200, 687, 202, 202, 202, 687, 213, 
+	0, 199, 200, 203, 214, 216, 222, 307, 
+	307, 199, 223, 307, 307, 0, 204, 0, 
+	206, 208, 0, 205, 206, 208, 209, 205, 
+	205, 207, 206, 206, 205, 687, 202, 202, 
+	210, 202, 687, 213, 0, 211, 212, 212, 
+	211, 212, 212, 0, 211, 212, 212, 211, 
+	212, 212, 0, 687, 202, 202, 210, 212, 
+	202, 212, 687, 213, 212, 212, 0, 199, 
+	200, 203, 214, 216, 222, 307, 202, 307, 
+	199, 223, 307, 307, 0, 201, 215, 214, 
+	214, 216, 217, 216, 0, 688, 202, 202, 
+	202, 688, 213, 0, 219, 0, 220, 0, 
+	221, 221, 0, 221, 200, 203, 214, 216, 
+	222, 226, 226, 221, 223, 226, 226, 0, 
+	223, 0, 687, 202, 202, 224, 202, 687, 
+	223, 213, 0, 225, 0, 687, 202, 202, 
+	202, 687, 225, 213, 0, 689, 202, 202, 
+	210, 226, 202, 226, 689, 213, 226, 226, 
+	0, 228, 0, 229, 0, 688, 202, 202, 
+	202, 217, 688, 213, 0, 231, 0, 199, 
+	199, 0, 231, 17, 231, 0, 234, 0, 
+	235, 0, 229, 0, 237, 260, 0, 238, 
+	239, 238, 0, 238, 239, 82, 82, 238, 
+	82, 82, 0, 240, 241, 244, 254, 256, 
+	240, 257, 0, 240, 241, 244, 254, 256, 
+	240, 257, 0, 242, 243, 241, 242, 217, 
+	240, 242, 0, 241, 245, 0, 247, 249, 
+	0, 246, 247, 249, 250, 246, 246, 248, 
+	247, 247, 246, 242, 217, 240, 251, 242, 
+	0, 252, 253, 253, 252, 253, 253, 0, 
+	252, 253, 253, 252, 253, 253, 0, 242, 
+	217, 240, 251, 253, 253, 242, 253, 253, 
+	0, 242, 255, 254, 254, 257, 0, 242, 
+	217, 240, 258, 242, 257, 0, 259, 0, 
+	242, 217, 240, 242, 259, 0, 261, 261, 
+	0, 261, 262, 266, 261, 0, 263, 0, 
+	264, 0, 265, 0, 688, 202, 202, 202, 
+	688, 213, 0, 267, 270, 0, 268, 0, 
+	269, 269, 0, 269, 262, 266, 269, 0, 
+	271, 0, 265, 0, 231, 273, 231, 0, 
+	274, 28, 0, 231, 0, 276, 279, 283, 
+	0, 277, 0, 278, 0, 231, 0, 280, 
+	0, 281, 0, 282, 0, 229, 0, 284, 
+	0, 285, 0, 229, 0, 231, 287, 0, 
+	288, 0, 289, 289, 0, 289, 290, 292, 
+	289, 0, 291, 0, 291, 239, 291, 0, 
+	293, 0, 274, 0, 38, 295, 0, 221, 
+	58, 221, 0, 297, 0, 298, 0, 299, 
+	0, 300, 0, 229, 0, 302, 195, 0, 
+	303, 0, 229, 0, 305, 0, 235, 0, 
+	276, 0, 687, 202, 202, 210, 307, 202, 
+	307, 687, 213, 307, 307, 0, 302, 0, 
+	200, 311, 0, 126, 0, 167, 0, 684, 
+	93, 93, 101, 313, 93, 313, 684, 104, 
+	313, 313, 0, 193, 0, 91, 690, 316, 
+	316, 690, 316, 316, 0, 195, 0, 319, 
+	0, 320, 0, 321, 0, 1, 2, 322, 
+	322, 1, 322, 322, 0, 691, 322, 322, 
+	691, 322, 322, 0, 324, 0, 325, 325, 
+	0, 325, 326, 326, 325, 326, 326, 0, 
+	674, 326, 326, 674, 326, 326, 0, 328, 
+	0, 329, 0, 330, 0, 331, 0, 332, 
+	332, 0, 332, 333, 336, 347, 349, 355, 
+	440, 440, 332, 356, 440, 440, 0, 334, 
+	442, 333, 692, 335, 335, 335, 692, 346, 
+	0, 332, 333, 336, 347, 349, 355, 440, 
+	440, 332, 356, 440, 440, 0, 337, 0, 
+	339, 341, 0, 338, 339, 341, 342, 338, 
+	338, 340, 339, 339, 338, 692, 335, 335, 
+	343, 335, 692, 346, 0, 344, 345, 345, 
+	344, 345, 345, 0, 344, 345, 345, 344, 
+	345, 345, 0, 692, 335, 335, 343, 345, 
+	335, 345, 692, 346, 345, 345, 0, 332, 
+	333, 336, 347, 349, 355, 440, 335, 440, 
+	332, 356, 440, 440, 0, 334, 348, 347, 
+	347, 349, 350, 349, 0, 693, 335, 335, 
+	335, 693, 346, 0, 352, 0, 353, 0, 
+	354, 354, 0, 354, 333, 336, 347, 349, 
+	355, 359, 359, 354, 356, 359, 359, 0, 
+	356, 0, 692, 335, 335, 357, 335, 692, 
+	356, 346, 0, 358, 0, 692, 335, 335, 
+	335, 692, 358, 346, 0, 694, 335, 335, 
+	343, 359, 335, 359, 694, 346, 359, 359, 
+	0, 361, 0, 362, 0, 693, 335, 335, 
+	335, 350, 693, 346, 0, 364, 0, 332, 
+	332, 0, 364, 17, 364, 0, 367, 0, 
+	368, 0, 362, 0, 370, 393, 0, 371, 
+	372, 371, 0, 371, 372, 326, 326, 371, 
+	326, 326, 0, 373, 374, 377, 387, 389, 
+	373, 390, 0, 373, 374, 377, 387, 389, 
+	373, 390, 0, 375, 376, 374, 375, 350, 
+	373, 375, 0, 374, 378, 0, 380, 382, 
+	0, 379, 380, 382, 383, 379, 379, 381, 
+	380, 380, 379, 375, 350, 373, 384, 375, 
+	0, 385, 386, 386, 385, 386, 386, 0, 
+	385, 386, 386, 385, 386, 386, 0, 375, 
+	350, 373, 384, 386, 386, 375, 386, 386, 
+	0, 375, 388, 387, 387, 390, 0, 375, 
+	350, 373, 391, 375, 390, 0, 392, 0, 
+	375, 350, 373, 375, 392, 0, 394, 394, 
+	0, 394, 395, 399, 394, 0, 396, 0, 
+	397, 0, 398, 0, 693, 335, 335, 335, 
+	693, 346, 0, 400, 403, 0, 401, 0, 
+	402, 402, 0, 402, 395, 399, 402, 0, 
+	404, 0, 398, 0, 364, 406, 364, 0, 
+	407, 28, 0, 364, 0, 409, 412, 416, 
+	0, 410, 0, 411, 0, 364, 0, 413, 
+	0, 414, 0, 415, 0, 362, 0, 417, 
+	0, 418, 0, 362, 0, 364, 420, 0, 
+	421, 0, 422, 422, 0, 422, 423, 425, 
+	422, 0, 424, 0, 424, 372, 424, 0, 
+	426, 0, 407, 0, 38, 428, 0, 354, 
+	58, 354, 0, 430, 0, 431, 0, 432, 
+	0, 433, 0, 362, 0, 435, 195, 0, 
+	436, 0, 362, 0, 438, 0, 368, 0, 
+	409, 0, 692, 335, 335, 343, 440, 335, 
+	440, 692, 346, 440, 440, 0, 435, 0, 
+	333, 443, 444, 448, 459, 461, 518, 522, 
+	522, 443, 519, 522, 522, 0, 445, 547, 
+	444, 446, 695, 447, 447, 447, 446, 458, 
+	0, 446, 695, 447, 447, 447, 464, 523, 
+	467, 468, 526, 469, 504, 529, 511, 517, 
+	537, 542, 545, 446, 458, 0, 443, 444, 
+	448, 459, 461, 518, 522, 522, 443, 519, 
+	522, 522, 0, 449, 0, 451, 453, 0, 
+	450, 451, 453, 454, 450, 450, 452, 451, 
+	451, 450, 446, 695, 447, 447, 455, 447, 
+	446, 458, 0, 456, 457, 457, 456, 457, 
+	457, 0, 456, 457, 457, 456, 457, 457, 
+	0, 446, 695, 447, 447, 455, 457, 447, 
+	457, 446, 458, 457, 457, 0, 443, 444, 
+	448, 459, 461, 518, 522, 447, 522, 443, 
+	519, 522, 522, 0, 445, 460, 459, 459, 
+	461, 462, 461, 0, 463, 695, 447, 447, 
+	447, 463, 458, 0, 463, 695, 447, 447, 
+	447, 464, 467, 468, 469, 504, 507, 511, 
+	517, 463, 458, 0, 465, 0, 466, 0, 
+	443, 443, 0, 466, 0, 466, 466, 0, 
+	470, 492, 0, 470, 471, 470, 0, 472, 
+	473, 476, 486, 488, 472, 489, 0, 472, 
+	473, 476, 486, 488, 472, 489, 0, 474, 
+	475, 473, 474, 462, 472, 474, 0, 473, 
+	477, 0, 479, 481, 0, 478, 479, 481, 
+	482, 478, 478, 480, 479, 479, 478, 474, 
+	462, 472, 483, 474, 0, 484, 485, 485, 
+	484, 485, 485, 0, 484, 485, 485, 484, 
+	485, 485, 0, 474, 462, 472, 483, 485, 
+	485, 474, 485, 485, 0, 474, 487, 486, 
+	486, 489, 0, 474, 462, 472, 490, 474, 
+	489, 0, 491, 0, 474, 462, 472, 474, 
+	491, 0, 493, 493, 0, 493, 494, 498, 
+	493, 0, 495, 0, 496, 0, 497, 0, 
+	463, 695, 447, 447, 447, 463, 458, 0, 
+	499, 502, 0, 500, 0, 501, 501, 0, 
+	501, 494, 498, 501, 0, 503, 0, 497, 
+	0, 466, 505, 466, 0, 506, 0, 466, 
+	0, 508, 0, 509, 0, 510, 0, 466, 
+	0, 466, 512, 0, 513, 0, 514, 514, 
+	0, 514, 515, 516, 514, 0, 470, 0, 
+	505, 0, 466, 0, 519, 0, 446, 695, 
+	447, 447, 520, 447, 446, 519, 458, 0, 
+	521, 0, 446, 695, 447, 447, 447, 446, 
+	521, 458, 0, 446, 695, 447, 447, 455, 
+	522, 447, 522, 446, 458, 522, 522, 0, 
+	524, 0, 525, 0, 463, 695, 447, 447, 
+	447, 462, 463, 458, 0, 527, 0, 528, 
+	0, 525, 0, 508, 530, 534, 0, 531, 
+	0, 532, 0, 533, 0, 525, 0, 535, 
+	0, 536, 0, 525, 0, 538, 0, 539, 
+	0, 540, 0, 541, 0, 525, 0, 543, 
+	0, 544, 0, 525, 0, 546, 0, 528, 
+	0, 444, 548, 549, 556, 556, 548, 556, 
+	556, 0, 549, 550, 549, 0, 551, 696, 
+	551, 0, 551, 696, 552, 551, 0, 553, 
+	0, 554, 0, 555, 0, 548, 549, 556, 
+	556, 548, 556, 556, 0, 557, 696, 556, 
+	556, 557, 556, 556, 0, 557, 696, 552, 
+	558, 562, 557, 0, 559, 0, 560, 560, 
+	0, 560, 561, 561, 560, 561, 561, 0, 
+	551, 696, 561, 561, 551, 561, 561, 0, 
+	563, 0, 564, 0, 565, 0, 566, 0, 
+	567, 567, 0, 567, 568, 572, 583, 585, 
+	644, 648, 648, 567, 645, 648, 648, 0, 
+	569, 673, 568, 570, 696, 571, 571, 571, 
+	570, 582, 0, 570, 696, 571, 571, 571, 
+	588, 649, 591, 552, 592, 652, 593, 629, 
+	655, 636, 643, 663, 668, 671, 570, 582, 
+	0, 567, 568, 572, 583, 585, 644, 648, 
+	648, 567, 645, 648, 648, 0, 573, 0, 
+	575, 577, 0, 574, 575, 577, 578, 574, 
+	574, 576, 575, 575, 574, 570, 696, 571, 
+	571, 579, 571, 570, 582, 0, 580, 581, 
+	581, 580, 581, 581, 0, 580, 581, 581, 
+	580, 581, 581, 0, 570, 696, 571, 571, 
+	579, 581, 571, 581, 570, 582, 581, 581, 
+	0, 567, 568, 572, 583, 585, 644, 648, 
+	571, 648, 567, 645, 648, 648, 0, 569, 
+	584, 583, 583, 585, 586, 585, 0, 587, 
+	696, 571, 571, 571, 587, 582, 0, 587, 
+	696, 571, 571, 571, 588, 591, 552, 592, 
+	593, 629, 632, 636, 643, 587, 582, 0, 
+	589, 0, 590, 0, 567, 567, 0, 590, 
+	0, 590, 590, 0, 594, 617, 0, 595, 
+	596, 595, 0, 595, 596, 561, 561, 595, 
+	561, 561, 0, 597, 598, 601, 611, 613, 
+	597, 614, 0, 597, 598, 601, 611, 613, 
+	597, 614, 0, 599, 600, 598, 599, 586, 
+	597, 599, 0, 598, 602, 0, 604, 606, 
+	0, 603, 604, 606, 607, 603, 603, 605, 
+	604, 604, 603, 599, 586, 597, 608, 599, 
+	0, 609, 610, 610, 609, 610, 610, 0, 
+	609, 610, 610, 609, 610, 610, 0, 599, 
+	586, 597, 608, 610, 610, 599, 610, 610, 
+	0, 599, 612, 611, 611, 614, 0, 599, 
+	586, 597, 615, 599, 614, 0, 616, 0, 
+	599, 586, 597, 599, 616, 0, 618, 618, 
+	0, 618, 619, 623, 618, 0, 620, 0, 
+	621, 0, 622, 0, 587, 696, 571, 571, 
+	571, 587, 582, 0, 624, 627, 0, 625, 
+	0, 626, 626, 0, 626, 619, 623, 626, 
+	0, 628, 0, 622, 0, 590, 630, 590, 
+	0, 631, 0, 590, 0, 633, 0, 634, 
+	0, 635, 0, 590, 0, 590, 637, 0, 
+	638, 0, 639, 639, 0, 639, 640, 642, 
+	639, 0, 641, 0, 641, 596, 641, 0, 
+	630, 0, 590, 0, 645, 0, 570, 696, 
+	571, 571, 646, 571, 570, 645, 582, 0, 
+	647, 0, 570, 696, 571, 571, 571, 570, 
+	647, 582, 0, 570, 696, 571, 571, 579, 
+	648, 571, 648, 570, 582, 648, 648, 0, 
+	650, 0, 651, 0, 587, 696, 571, 571, 
+	571, 586, 587, 582, 0, 653, 0, 654, 
+	0, 651, 0, 633, 656, 660, 0, 657, 
+	0, 658, 0, 659, 0, 651, 0, 661, 
+	0, 662, 0, 651, 0, 664, 0, 665, 
+	0, 666, 0, 667, 0, 651, 0, 669, 
+	0, 670, 0, 651, 0, 672, 0, 654, 
+	0, 568, 674, 4, 318, 16, 26, 83, 
+	46, 674, 0, 675, 4, 10, 16, 26, 
+	83, 46, 675, 0, 676, 4, 10, 16, 
+	79, 26, 83, 46, 85, 676, 0, 677, 
+	24, 26, 56, 46, 677, 0, 678, 34, 
+	37, 46, 678, 0, 679, 37, 46, 679, 
+	0, 680, 46, 680, 0, 681, 681, 0, 
+	682, 64, 66, 69, 70, 72, 26, 37, 
+	46, 682, 0, 683, 64, 26, 37, 46, 
+	683, 0, 684, 93, 93, 93, 109, 118, 
+	121, 10, 123, 124, 127, 163, 166, 177, 
+	185, 46, 187, 314, 310, 684, 104, 0, 
+	685, 93, 93, 93, 109, 121, 10, 123, 
+	127, 163, 312, 177, 185, 46, 685, 104, 
+	0, 686, 93, 93, 93, 109, 118, 121, 
+	10, 123, 124, 127, 163, 166, 177, 185, 
+	46, 187, 192, 310, 686, 104, 0, 687, 
+	202, 202, 202, 218, 227, 230, 10, 232, 
+	233, 236, 272, 275, 286, 294, 46, 296, 
+	308, 304, 687, 213, 0, 688, 202, 202, 
+	202, 218, 230, 10, 232, 236, 272, 306, 
+	286, 294, 46, 688, 213, 0, 689, 202, 
+	202, 202, 218, 227, 230, 10, 232, 233, 
+	236, 272, 275, 286, 294, 46, 296, 301, 
+	304, 689, 213, 0, 690, 4, 10, 16, 
+	79, 26, 83, 46, 317, 690, 0, 691, 
+	4, 318, 16, 323, 26, 83, 46, 327, 
+	691, 0, 692, 335, 335, 335, 351, 360, 
+	363, 318, 365, 366, 369, 405, 408, 419, 
+	427, 46, 429, 441, 437, 692, 346, 0, 
+	693, 335, 335, 335, 351, 363, 318, 365, 
+	369, 405, 439, 419, 427, 46, 693, 346, 
+	0, 694, 335, 335, 335, 351, 360, 363, 
+	318, 365, 366, 369, 405, 408, 419, 427, 
+	46, 429, 434, 437, 694, 346, 0, 0, 
+	0, 0
 };
 
 static const unsigned char _querybuilder_trans_actions[] = {
-	0, 37, 1, 1, 0, 1, 1, 0, 
-	0, 0, 0, 0, 0, 0, 59, 1, 
-	0, 1, 0, 57, 57, 0, 0, 37, 
+	0, 39, 1, 1, 0, 1, 1, 0, 
+	0, 0, 0, 0, 0, 0, 61, 1, 
+	0, 1, 0, 59, 59, 0, 0, 39, 
 	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, 
+	0, 0, 0, 0, 61, 0, 0, 0, 
+	0, 0, 0, 57, 168, 165, 165, 57, 
+	165, 165, 0, 0, 39, 1, 1, 0, 
 	1, 1, 0, 23, 1, 1, 23, 1, 
-	1, 59, 0, 0, 0, 0, 0, 0, 
+	1, 61, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 53, 157, 157, 53, 157, 
-	157, 0, 0, 1, 1, 0, 1, 1, 
+	0, 0, 0, 55, 162, 162, 55, 162, 
+	162, 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, 61, 0, 0, 0, 0, 0, 0, 
+	0, 0, 51, 156, 51, 156, 0, 0, 
 	1, 0, 1, 0, 1, 0, 9, 9, 
-	9, 1, 59, 0, 1, 0, 1, 0, 
-	1, 0, 9, 9, 1, 59, 0, 0, 
+	9, 1, 61, 0, 1, 0, 1, 0, 
+	1, 0, 9, 9, 1, 61, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	43, 145, 43, 145, 0, 0, 1, 0, 
-	1, 0, 1, 0, 9, 9, 1, 59, 
+	45, 150, 45, 150, 0, 0, 1, 0, 
+	1, 0, 1, 0, 9, 9, 1, 61, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 47, 148, 
-	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, 49, 153, 
+	153, 49, 153, 153, 0, 0, 1, 1, 
+	0, 1, 1, 0, 47, 1, 1, 47, 
+	1, 1, 61, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 51, 154, 154, 
-	51, 154, 154, 0, 0, 1, 1, 0, 
+	0, 0, 0, 0, 0, 53, 159, 159, 
+	53, 159, 159, 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, 
+	13, 1, 1, 61, 1, 0, 1, 0, 
+	21, 21, 21, 61, 1, 0, 1, 0, 
+	1, 0, 1, 0, 19, 111, 111, 19, 
+	111, 111, 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, 
+	1, 1, 61, 19, 111, 111, 19, 111, 
+	111, 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, 61, 0, 0, 0, 0, 0, 0, 
+	1, 1, 0, 1, 1, 0, 43, 1, 
+	1, 43, 1, 1, 61, 0, 1, 0, 
+	59, 0, 59, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 33, 33, 0, 0, 
+	0, 0, 0, 35, 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, 1, 0, 1, 61, 25, 25, 
+	25, 25, 123, 120, 120, 120, 25, 120, 
+	120, 120, 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, 
+	1, 61, 19, 111, 111, 19, 111, 111, 
 	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, 
+	15, 93, 93, 15, 1, 93, 1, 15, 
+	93, 1, 1, 61, 25, 25, 25, 25, 
+	123, 120, 120, 1, 120, 25, 120, 120, 
+	120, 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, 
+	61, 1, 0, 1, 0, 171, 171, 0, 
+	0, 0, 0, 0, 144, 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, 
+	63, 63, 1, 63, 9, 1, 63, 61, 
+	1, 0, 11, 72, 72, 72, 11, 1, 
+	72, 61, 114, 81, 81, 13, 1, 81, 
+	1, 114, 81, 1, 1, 61, 1, 0, 
+	1, 0, 31, 132, 132, 132, 31, 31, 
+	132, 61, 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, 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, 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, 
-	0, 0, 0, 27, 27, 0, 0, 1, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 1, 1, 0, 1, 1, 0, 
+	27, 27, 27, 27, 129, 27, 129, 0, 
+	0, 0, 0, 0, 1, 0, 1, 0, 
+	5, 0, 1, 0, 0, 0, 0, 0, 
+	1, 0, 0, 1, 0, 0, 1, 1, 
+	0, 7, 1, 1, 1, 1, 1, 1, 
+	0, 0, 0, 0, 0, 0, 19, 111, 
+	111, 19, 111, 111, 0, 0, 1, 1, 
+	0, 1, 1, 0, 15, 15, 15, 15, 
+	1, 1, 15, 1, 1, 0, 3, 0, 
+	1, 1, 1, 0, 9, 9, 9, 1, 
+	9, 1, 0, 1, 0, 11, 11, 11, 
+	11, 1, 0, 29, 29, 0, 0, 1, 
 	1, 0, 0, 1, 0, 1, 0, 1, 
-	0, 17, 100, 100, 100, 17, 100, 59, 
+	0, 17, 102, 102, 102, 17, 102, 61, 
 	1, 1, 0, 1, 0, 1, 1, 0, 
 	1, 1, 1, 1, 0, 1, 0, 1, 
 	0, 1, 1, 1, 0, 1, 0, 0, 
@@ -1208,191 +1332,347 @@ static const unsigned char _querybuilder_trans_actions[] = {
 	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, 
+	25, 0, 0, 0, 1, 0, 0, 0, 
+	0, 0, 0, 0, 0, 1, 0, 1, 
+	0, 0, 1, 0, 171, 0, 171, 0, 
 	1, 0, 1, 0, 1, 0, 1, 0, 
-	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, 109, 19, 109, 109, 0, 
+	1, 0, 1, 0, 0, 1, 0, 1, 
+	0, 0, 0, 0, 0, 0, 0, 33, 
+	33, 0, 0, 0, 0, 0, 35, 1, 
+	1, 1, 0, 1, 1, 1, 0, 5, 
+	0, 1, 0, 1, 1, 1, 0, 1, 
+	61, 25, 25, 25, 25, 123, 120, 120, 
+	120, 25, 120, 120, 120, 0, 0, 0, 
+	1, 0, 0, 1, 1, 0, 7, 1, 
+	1, 1, 1, 1, 1, 0, 1, 1, 
+	0, 1, 0, 1, 61, 19, 111, 111, 
+	19, 111, 111, 0, 0, 1, 1, 0, 
+	1, 1, 0, 15, 93, 93, 15, 1, 
+	93, 1, 15, 93, 1, 1, 61, 25, 
+	25, 25, 25, 123, 120, 120, 1, 120, 
+	25, 120, 120, 120, 0, 3, 0, 1, 
+	1, 0, 0, 0, 0, 0, 1, 1, 
+	1, 0, 1, 61, 1, 0, 1, 0, 
+	171, 171, 0, 0, 0, 0, 0, 141, 
+	1, 1, 1, 0, 1, 1, 1, 0, 
+	1, 0, 9, 63, 63, 1, 63, 9, 
+	1, 63, 61, 1, 0, 11, 72, 72, 
+	72, 11, 1, 72, 61, 114, 81, 81, 
+	13, 1, 81, 1, 114, 81, 1, 1, 
+	61, 1, 0, 1, 0, 31, 132, 132, 
+	132, 31, 31, 132, 61, 1, 0, 25, 
+	25, 0, 1, 0, 1, 0, 1, 0, 
+	1, 0, 1, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 1, 1, 0, 
+	1, 1, 0, 27, 27, 27, 27, 129, 
+	27, 129, 0, 0, 0, 0, 0, 1, 
+	0, 1, 0, 5, 0, 1, 0, 0, 
+	0, 0, 0, 1, 0, 0, 1, 0, 
+	0, 1, 1, 0, 7, 1, 1, 1, 
+	1, 1, 1, 0, 0, 0, 0, 0, 
+	0, 19, 111, 111, 19, 111, 111, 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, 
+	15, 15, 15, 1, 1, 15, 1, 1, 
+	0, 3, 0, 1, 1, 1, 0, 9, 
+	9, 9, 1, 9, 1, 0, 1, 0, 
+	11, 11, 11, 11, 1, 0, 29, 29, 
+	0, 0, 1, 1, 0, 0, 1, 0, 
+	1, 0, 1, 0, 17, 102, 102, 102, 
+	17, 102, 61, 1, 1, 0, 1, 0, 
 	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, 
+	1, 0, 1, 0, 1, 1, 1, 0, 
+	1, 0, 0, 1, 0, 1, 1, 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, 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, 1, 0, 1, 0, 1, 0, 1, 
+	0, 1, 0, 1, 0, 1, 1, 0, 
+	1, 0, 25, 25, 0, 0, 0, 1, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	55, 163, 160, 160, 55, 160, 160, 0, 
-	23, 115, 1, 1, 23, 1, 1, 0, 
-	0, 39, 0, 0, 0, 0, 0, 0, 
+	1, 0, 1, 0, 0, 1, 0, 171, 
+	0, 171, 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, 81, 81, 13, 1, 81, 
+	1, 13, 81, 1, 1, 61, 1, 0, 
+	1, 1, 0, 1, 0, 1, 0, 13, 
+	81, 81, 13, 1, 81, 1, 13, 81, 
+	1, 1, 61, 1, 0, 1, 23, 1, 
+	1, 23, 1, 1, 61, 0, 0, 0, 
+	0, 0, 0, 0, 0, 57, 168, 165, 
+	165, 57, 165, 165, 0, 23, 1, 1, 
+	23, 1, 1, 61, 0, 0, 0, 0, 
+	0, 0, 1, 1, 0, 1, 1, 0, 
+	43, 1, 1, 43, 1, 1, 61, 0, 
+	0, 0, 0, 0, 0, 0, 0, 33, 
+	33, 0, 0, 0, 0, 0, 35, 1, 
+	1, 1, 0, 1, 1, 1, 0, 5, 
+	0, 1, 0, 1, 1, 1, 0, 1, 
+	61, 25, 25, 25, 25, 123, 120, 120, 
+	120, 25, 120, 120, 120, 0, 0, 0, 
+	1, 0, 0, 1, 1, 0, 7, 1, 
+	1, 1, 1, 1, 1, 0, 1, 1, 
+	0, 1, 0, 1, 61, 19, 111, 111, 
+	19, 111, 111, 0, 0, 1, 1, 0, 
+	1, 1, 0, 15, 93, 93, 15, 1, 
+	93, 1, 15, 93, 1, 1, 61, 25, 
+	25, 25, 25, 123, 120, 120, 1, 120, 
+	25, 120, 120, 120, 0, 3, 0, 1, 
+	1, 0, 0, 0, 0, 0, 1, 1, 
+	1, 0, 1, 61, 1, 0, 1, 0, 
+	126, 126, 0, 0, 0, 0, 0, 141, 
+	1, 1, 1, 0, 1, 1, 1, 0, 
+	1, 0, 9, 63, 63, 1, 63, 9, 
+	1, 63, 61, 1, 0, 11, 72, 72, 
+	72, 11, 1, 72, 61, 84, 81, 81, 
+	13, 1, 81, 1, 84, 81, 1, 1, 
+	61, 1, 0, 1, 0, 31, 132, 132, 
+	132, 31, 31, 132, 61, 1, 0, 25, 
+	25, 0, 1, 0, 1, 0, 1, 0, 
+	1, 0, 1, 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, 
-	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, 
+	1, 1, 0, 27, 27, 27, 27, 129, 
+	27, 129, 0, 0, 0, 0, 0, 1, 
+	0, 1, 0, 5, 0, 1, 0, 0, 
+	0, 0, 0, 1, 0, 0, 1, 0, 
+	0, 1, 1, 0, 7, 1, 1, 1, 
+	1, 1, 1, 0, 0, 0, 0, 0, 
+	0, 19, 111, 111, 19, 111, 111, 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, 
-	1, 0, 1, 0, 1, 1, 1, 1, 
-	0, 1, 0, 1, 0, 1, 0, 25, 
-	25, 0, 1, 0, 1, 1, 0, 0, 
-	0, 0, 27, 27, 0, 0, 1, 1, 
+	15, 15, 15, 1, 1, 15, 1, 1, 
+	0, 3, 0, 1, 1, 1, 0, 9, 
+	9, 9, 1, 9, 1, 0, 1, 0, 
+	11, 11, 11, 11, 1, 0, 29, 29, 
+	0, 0, 1, 1, 0, 0, 1, 0, 
+	1, 0, 1, 0, 17, 102, 102, 102, 
+	17, 102, 61, 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, 0, 1, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	1, 0, 1, 0, 0, 1, 0, 126, 
+	0, 126, 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, 81, 81, 13, 1, 81, 
+	1, 13, 81, 1, 1, 61, 1, 0, 
+	1, 0, 0, 0, 0, 35, 1, 1, 
+	1, 0, 1, 1, 1, 0, 5, 0, 
+	1, 0, 37, 1, 1, 1, 0, 1, 
+	0, 0, 37, 1, 1, 1, 1, 1, 
+	1, 1, 1, 0, 1, 1, 1, 1, 
+	1, 1, 1, 0, 1, 0, 25, 25, 
+	25, 25, 123, 120, 120, 120, 25, 120, 
+	120, 120, 0, 0, 0, 1, 0, 0, 
+	1, 1, 0, 7, 1, 1, 1, 1, 
+	1, 1, 0, 37, 1, 1, 0, 1, 
+	0, 1, 0, 19, 111, 111, 19, 111, 
+	111, 0, 0, 1, 1, 0, 1, 1, 
+	0, 15, 96, 93, 93, 15, 1, 93, 
+	1, 15, 93, 1, 1, 0, 25, 25, 
+	25, 25, 123, 120, 120, 1, 120, 25, 
+	120, 120, 120, 0, 3, 0, 1, 1, 
+	0, 0, 0, 0, 0, 37, 1, 1, 
+	1, 0, 1, 0, 0, 37, 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, 0, 0, 0, 0, 0, 27, 
+	27, 27, 27, 129, 27, 129, 0, 0, 
+	0, 0, 0, 1, 0, 1, 0, 5, 
+	0, 1, 0, 0, 0, 0, 0, 1, 
+	0, 0, 1, 0, 0, 1, 1, 0, 
+	7, 1, 1, 1, 1, 1, 1, 0, 
+	0, 0, 0, 0, 0, 19, 111, 111, 
+	19, 111, 111, 0, 0, 1, 1, 0, 
+	1, 1, 0, 15, 15, 15, 15, 1, 
+	1, 15, 1, 1, 0, 3, 0, 1, 
+	1, 1, 0, 9, 9, 9, 1, 9, 
+	1, 0, 1, 0, 11, 11, 11, 11, 
+	1, 0, 29, 29, 0, 0, 1, 1, 
 	0, 0, 1, 0, 1, 0, 1, 0, 
-	17, 106, 100, 100, 100, 17, 100, 0, 
+	17, 105, 102, 102, 102, 17, 102, 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, 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, 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, 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, 
-	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, 1, 0, 1, 1, 0, 1, 
+	0, 0, 0, 1, 0, 0, 0, 0, 
+	1, 0, 1, 0, 1, 0, 9, 66, 
+	63, 63, 1, 63, 9, 1, 63, 0, 
+	1, 0, 11, 75, 72, 72, 72, 11, 
+	1, 72, 0, 13, 87, 81, 81, 13, 
+	1, 81, 1, 13, 81, 1, 1, 0, 
+	1, 0, 1, 0, 31, 135, 132, 132, 
+	132, 31, 31, 132, 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, 39, 1, 1, 0, 1, 
+	1, 0, 0, 0, 0, 0, 0, 41, 
+	0, 0, 0, 41, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 57, 168, 165, 
+	165, 57, 165, 165, 0, 23, 117, 1, 
+	1, 23, 1, 1, 0, 0, 41, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 1, 1, 0, 1, 1, 0, 
+	43, 147, 1, 1, 43, 1, 1, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	33, 33, 0, 0, 0, 0, 0, 35, 
 	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, 
+	5, 0, 1, 0, 41, 1, 1, 1, 
+	0, 1, 0, 0, 41, 1, 1, 1, 
+	1, 1, 1, 0, 1, 1, 0, 1, 
+	1, 1, 1, 1, 1, 1, 0, 1, 
+	0, 25, 25, 25, 25, 123, 120, 120, 
+	120, 25, 120, 120, 120, 0, 0, 0, 
+	1, 0, 0, 1, 1, 0, 7, 1, 
+	1, 1, 1, 1, 1, 0, 41, 1, 
+	1, 0, 1, 0, 1, 0, 19, 111, 
+	111, 19, 111, 111, 0, 0, 1, 1, 
+	0, 1, 1, 0, 15, 99, 93, 93, 
+	15, 1, 93, 1, 15, 93, 1, 1, 
+	0, 25, 25, 25, 25, 123, 120, 120, 
+	1, 120, 25, 120, 120, 120, 0, 3, 
+	0, 1, 1, 0, 0, 0, 0, 0, 
+	41, 1, 1, 1, 0, 1, 0, 0, 
+	41, 1, 1, 1, 1, 1, 0, 1, 
+	0, 1, 1, 1, 1, 0, 1, 0, 
+	1, 0, 1, 0, 25, 25, 0, 1, 
+	0, 1, 1, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 1, 1, 0, 
+	1, 1, 0, 27, 27, 27, 27, 129, 
+	27, 129, 0, 0, 0, 0, 0, 1, 
+	0, 1, 0, 5, 0, 1, 0, 0, 
+	0, 0, 0, 1, 0, 0, 1, 0, 
+	0, 1, 1, 0, 7, 1, 1, 1, 
+	1, 1, 1, 0, 0, 0, 0, 0, 
+	0, 19, 111, 111, 19, 111, 111, 0, 
+	0, 1, 1, 0, 1, 1, 0, 15, 
+	15, 15, 15, 1, 1, 15, 1, 1, 
+	0, 3, 0, 1, 1, 1, 0, 9, 
+	9, 9, 1, 9, 1, 0, 1, 0, 
+	11, 11, 11, 11, 1, 0, 29, 29, 
+	0, 0, 1, 1, 0, 0, 1, 0, 
+	1, 0, 1, 0, 17, 108, 102, 102, 
+	102, 17, 102, 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, 0, 1, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	1, 0, 1, 0, 1, 0, 9, 69, 
+	63, 63, 1, 63, 9, 1, 63, 0, 
+	1, 0, 11, 78, 72, 72, 72, 11, 
+	1, 72, 0, 13, 90, 81, 81, 13, 
+	1, 81, 1, 13, 81, 1, 1, 0, 
+	1, 0, 1, 0, 31, 138, 132, 132, 
+	132, 31, 31, 132, 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, 61, 0, 1, 0, 0, 0, 
+	1, 0, 0, 61, 0, 1, 0, 0, 
+	0, 0, 1, 0, 0, 0, 61, 0, 
+	0, 0, 0, 0, 0, 61, 0, 0, 
+	0, 0, 0, 61, 0, 0, 0, 0, 
+	61, 0, 0, 0, 61, 0, 0, 61, 
+	0, 0, 1, 1, 1, 1, 0, 0, 
+	0, 0, 61, 0, 0, 0, 0, 0, 
+	0, 61, 0, 1, 1, 1, 1, 1, 
+	1, 0, 1, 1, 0, 1, 1, 1, 
+	1, 0, 1, 1, 1, 0, 1, 61, 
+	0, 1, 1, 1, 1, 1, 0, 1, 
+	0, 1, 1, 1, 1, 0, 0, 1, 
+	61, 0, 1, 1, 1, 1, 1, 1, 
+	0, 1, 1, 0, 1, 1, 1, 1, 
+	0, 1, 1, 1, 0, 1, 61, 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, 0, 1, 61, 0, 1, 1, 
 	1, 1, 1, 0, 1, 0, 1, 1, 
-	1, 1, 0, 0, 1, 59, 0, 1, 
+	1, 1, 0, 0, 1, 61, 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, 61, 0, 1, 0, 0, 
+	0, 0, 1, 0, 0, 0, 61, 0, 
+	1, 0, 0, 0, 0, 1, 0, 0, 
+	0, 61, 0, 1, 1, 1, 1, 1, 
+	1, 0, 1, 1, 0, 1, 1, 1, 
+	1, 0, 1, 1, 1, 0, 1, 61, 
+	0, 1, 1, 1, 1, 1, 0, 1, 
+	0, 1, 1, 1, 1, 0, 0, 1, 
+	61, 0, 1, 1, 1, 1, 1, 1, 
+	0, 1, 1, 0, 1, 1, 1, 1, 
+	0, 1, 1, 1, 0, 1, 61, 0, 
+	0, 0
 };
 
 static const unsigned char _querybuilder_eof_actions[] = {
-	0, 0, 0, 59, 0, 0, 0, 0, 
-	0, 59, 0, 0, 0, 0, 0, 59, 
+	0, 0, 0, 61, 0, 0, 0, 0, 
+	0, 61, 0, 0, 0, 0, 0, 61, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 61, 0, 0, 0, 0, 0, 0, 
+	0, 61, 0, 0, 61, 0, 0, 0, 
+	0, 0, 0, 0, 0, 61, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 61, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 61, 0, 0, 61, 0, 0, 0, 
+	0, 0, 0, 61, 0, 0, 61, 0, 
+	0, 0, 61, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 61, 0, 0, 0, 
+	0, 0, 0, 0, 61, 0, 0, 61, 
+	0, 0, 0, 0, 61, 0, 0, 0, 
+	0, 0, 61, 0, 61, 61, 0, 0, 
+	61, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 61, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 61, 0, 0, 0, 0, 0, 0, 
+	0, 61, 0, 0, 61, 0, 0, 0, 
+	0, 61, 0, 0, 0, 0, 0, 61, 
+	0, 61, 61, 0, 0, 61, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 59, 0, 0, 0, 0, 0, 0, 
-	0, 59, 0, 0, 59, 0, 0, 0, 
-	0, 0, 0, 0, 0, 59, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 59, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 59, 0, 0, 59, 0, 0, 0, 
-	0, 0, 0, 59, 0, 0, 59, 0, 
-	0, 0, 59, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 59, 0, 0, 0, 
-	0, 0, 0, 0, 59, 0, 0, 59, 
-	0, 0, 0, 0, 59, 0, 0, 0, 
-	0, 0, 59, 0, 59, 59, 0, 0, 
-	59, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 59, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 61, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	59, 0, 0, 0, 0, 0, 0, 0, 
-	59, 0, 0, 59, 0, 0, 0, 0, 
-	59, 0, 0, 0, 0, 0, 59, 0, 
-	59, 59, 0, 0, 59, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 59, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 61, 0, 0, 0, 0, 
+	0, 61, 0, 0, 61, 0, 0, 0, 
+	0, 0, 61, 0, 0, 0, 61, 0, 
+	0, 0, 0, 0, 0, 0, 61, 0, 
+	0, 0, 0, 0, 0, 0, 61, 0, 
+	0, 61, 0, 0, 0, 0, 61, 0, 
+	0, 0, 0, 0, 61, 0, 61, 61, 
+	0, 0, 61, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 61, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 59, 0, 0, 0, 0, 0, 59, 
-	0, 0, 59, 0, 0, 0, 0, 0, 
-	59, 0, 0, 0, 59, 0, 0, 0, 
-	0, 0, 0, 0, 59, 0, 0, 0, 
-	0, 0, 0, 0, 59, 0, 0, 59, 
-	0, 0, 0, 0, 59, 0, 0, 0, 
-	0, 0, 59, 0, 59, 59, 0, 0, 
-	59, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 59, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 59, 0, 0, 
+	61, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
@@ -1418,19 +1698,25 @@ static const unsigned char _querybuilder_eof_actions[] = {
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0
 };
 
 static const int querybuilder_start = 1;
-static const int querybuilder_first_final = 551;
+static const int querybuilder_first_final = 674;
 static const int querybuilder_error = 0;
 
-static const int querybuilder_en_expr_p = 368;
-static const int querybuilder_en_clause_p = 450;
+static const int querybuilder_en_expr_p = 443;
+static const int querybuilder_en_clause_p = 548;
 static const int querybuilder_en_main = 1;
 
 
-#line 371 "querybuilder_ext.rl"
+#line 378 "querybuilder_ext.rl"
 
 #define CLAUSE_RELATION    1
 #define CLAUSE_PARENTHESIS 2
@@ -1471,14 +1757,14 @@ VALUE rb_parse(VALUE self, VALUE arg) {
 
 
   
-#line 1475 "querybuilder_ext.c"
+#line 1761 "querybuilder_ext.c"
 	{
 	cs = querybuilder_start;
 	}
 
-#line 411 "querybuilder_ext.rl"
+#line 418 "querybuilder_ext.rl"
   
-#line 1482 "querybuilder_ext.c"
+#line 1768 "querybuilder_ext.c"
 	{
 	int _klen;
 	unsigned int _trans;
@@ -1552,13 +1838,13 @@ _match:
 		switch ( *_acts++ )
 		{
 	case 0:
-#line 111 "querybuilder_ext.rl"
+#line 113 "querybuilder_ext.rl"
 	{
     if (str_a == NULL) str_a = p;
   }
 	break;
 	case 1:
-#line 115 "querybuilder_ext.rl"
+#line 117 "querybuilder_ext.rl"
 	{
     if (str_a == NULL) str_a = p;
     SET_TMP_ARY(_string);
@@ -1566,7 +1852,7 @@ _match:
   }
 	break;
 	case 2:
-#line 121 "querybuilder_ext.rl"
+#line 123 "querybuilder_ext.rl"
 	{
     if (str_a == NULL) str_a = p;
     SET_TMP_ARY(_dstring);
@@ -1574,49 +1860,49 @@ _match:
   }
 	break;
 	case 3:
-#line 127 "querybuilder_ext.rl"
+#line 129 "querybuilder_ext.rl"
 	{
     SET_TMP_ARY(_rubyless);
     rb_ary_push(last, tmp);
   }
 	break;
 	case 4:
-#line 132 "querybuilder_ext.rl"
+#line 134 "querybuilder_ext.rl"
 	{
     SET_TMP_ARY(_integer);
     rb_ary_push(last, tmp);
   }
 	break;
 	case 5:
-#line 137 "querybuilder_ext.rl"
+#line 139 "querybuilder_ext.rl"
 	{
     SET_TMP_ARY(_real);
     rb_ary_push(last, tmp);
   }
 	break;
 	case 6:
-#line 142 "querybuilder_ext.rl"
+#line 144 "querybuilder_ext.rl"
 	{
     SET_TMP_ARY(_field);
     rb_ary_push(last, tmp);
   }
 	break;
 	case 7:
-#line 147 "querybuilder_ext.rl"
+#line 149 "querybuilder_ext.rl"
 	{
     SET_TMP_ARY(_method);
     rb_ary_push(last, tmp);
   }
 	break;
 	case 8:
-#line 152 "querybuilder_ext.rl"
+#line 154 "querybuilder_ext.rl"
 	{
     SET_TMP_ARY(_raw);
     rb_ary_push(last, tmp);
   }
 	break;
 	case 9:
-#line 158 "querybuilder_ext.rl"
+#line 160 "querybuilder_ext.rl"
 	{
     // last = apply_op(stack, :function)
     APPLY_OP(_function);
@@ -1625,7 +1911,7 @@ _match:
   }
 	break;
 	case 10:
-#line 165 "querybuilder_ext.rl"
+#line 167 "querybuilder_ext.rl"
 	{
     SET_TMP_STR;
     tmp = ID2SYM(rb_to_id(rb_funcall(tmp, _downcase, 0)));
@@ -1634,7 +1920,7 @@ _match:
   }
 	break;
 	case 11:
-#line 172 "querybuilder_ext.rl"
+#line 174 "querybuilder_ext.rl"
 	{
     // if clause_state == :relation || clause_state == :parenthesis
     //   last = insert(stack, [:relation, str_buf])
@@ -1647,7 +1933,7 @@ _match:
   }
 	break;
 	case 12:
-#line 183 "querybuilder_ext.rl"
+#line 185 "querybuilder_ext.rl"
 	{
     SET_TMP_STR;
     tmp = ID2SYM(rb_to_id(rb_funcall(tmp, _downcase, 0)));
@@ -1656,15 +1942,22 @@ _match:
   }
 	break;
 	case 13:
-#line 190 "querybuilder_ext.rl"
+#line 192 "querybuilder_ext.rl"
+	{
+    APPLY_OP(_in);
+    // last = apply_op(stack, :in)
+  }
+	break;
+	case 14:
+#line 197 "querybuilder_ext.rl"
 	{
     // We need the 'is' operator to avoid confusion with 'in site'.
     APPLY_OP(_is);
     // last = apply_op(stack, :is)
   }
 	break;
-	case 14:
-#line 196 "querybuilder_ext.rl"
+	case 15:
+#line 203 "querybuilder_ext.rl"
 	{
     // last = apply_op(stack, :interval)
     APPLY_OP(_interval);
@@ -1673,16 +1966,16 @@ _match:
     rb_ary_push(last, tmp);
   }
 	break;
-	case 15:
-#line 204 "querybuilder_ext.rl"
+	case 16:
+#line 211 "querybuilder_ext.rl"
 	{
     // last = apply_op(stack, :filter)
     APPLY_OP(_filter);
     clause_state = CLAUSE_FILTER;
   }
 	break;
-	case 16:
-#line 210 "querybuilder_ext.rl"
+	case 17:
+#line 217 "querybuilder_ext.rl"
 	{
     // # remember current machine state 'cs'
     par_count = par_count + 1;
@@ -1695,11 +1988,11 @@ _match:
     rb_ary_push(stack, tmp);
     // last = last.last
     last = tmp;
-    {cs = 368; goto _again;}
+    {cs = 443; goto _again;}
   }
 	break;
-	case 17:
-#line 225 "querybuilder_ext.rl"
+	case 18:
+#line 232 "querybuilder_ext.rl"
 	{
     // pop_stack(stack, :par_close)
     rb_funcall(self, _pop_stack, 2, stack, _par_close);
@@ -1718,8 +2011,8 @@ _match:
     p--;
   }
 	break;
-	case 18:
-#line 243 "querybuilder_ext.rl"
+	case 19:
+#line 250 "querybuilder_ext.rl"
 	{
     clause_state = CLAUSE_PARENTHESIS;
     // # remember current machine state 'cs'
@@ -1732,11 +2025,11 @@ _match:
     rb_ary_push(stack, tmp);
     // last = last.last
     last = tmp;
-    {cs = 450; goto _again;}
+    {cs = 548; goto _again;}
   }
 	break;
-	case 19:
-#line 258 "querybuilder_ext.rl"
+	case 20:
+#line 265 "querybuilder_ext.rl"
 	{
     clause_state = CLAUSE_RELATION;
     // pop_stack(stack, :clause_par_close)
@@ -1755,8 +2048,8 @@ _match:
     p--;
   }
 	break;
-	case 20:
-#line 276 "querybuilder_ext.rl"
+	case 21:
+#line 283 "querybuilder_ext.rl"
 	{
     // last = apply_op(stack, :scope)
     APPLY_OP(_scope);
@@ -1765,8 +2058,8 @@ _match:
     rb_ary_push(last, tmp);
   }
 	break;
-	case 21:
-#line 284 "querybuilder_ext.rl"
+	case 22:
+#line 291 "querybuilder_ext.rl"
 	{
     // last = apply_op(stack, :offset)
     APPLY_OP(_offset);
@@ -1774,16 +2067,16 @@ _match:
     str_a = NULL;
   }
 	break;
-	case 22:
-#line 291 "querybuilder_ext.rl"
+	case 23:
+#line 298 "querybuilder_ext.rl"
 	{
     // last << [:param, str_buf]
     SET_TMP_ARY(_param);
     rb_ary_push(last, tmp);
   }
 	break;
-	case 23:
-#line 297 "querybuilder_ext.rl"
+	case 24:
+#line 304 "querybuilder_ext.rl"
 	{
     // last = apply_op(stack, :paginate)
     APPLY_OP(_paginate);
@@ -1791,8 +2084,8 @@ _match:
     str_a = NULL;
   }
 	break;
-	case 24:
-#line 304 "querybuilder_ext.rl"
+	case 25:
+#line 311 "querybuilder_ext.rl"
 	{
     // last = apply_op(stack, :limit)
     APPLY_OP(_limit);
@@ -1800,8 +2093,8 @@ _match:
     str_a = NULL;
   }
 	break;
-	case 25:
-#line 311 "querybuilder_ext.rl"
+	case 26:
+#line 318 "querybuilder_ext.rl"
 	{
     // last = apply_op(stack, :order)
     APPLY_OP(_order);
@@ -1809,8 +2102,8 @@ _match:
     str_a = NULL;
   }
 	break;
-	case 26:
-#line 318 "querybuilder_ext.rl"
+	case 27:
+#line 325 "querybuilder_ext.rl"
 	{
     // last = apply_op(stack, :group)
     APPLY_OP(_group);
@@ -1818,8 +2111,8 @@ _match:
     str_a = NULL;
   }
 	break;
-	case 27:
-#line 325 "querybuilder_ext.rl"
+	case 28:
+#line 332 "querybuilder_ext.rl"
 	{
     // last = apply_op(stack, :from)
     APPLY_OP(_from);
@@ -1828,8 +2121,8 @@ _match:
     clause_state = CLAUSE_RELATION;
   }
 	break;
-	case 28:
-#line 333 "querybuilder_ext.rl"
+	case 29:
+#line 340 "querybuilder_ext.rl"
 	{
     // if clause_state == :relation
     //   last = apply_op(stack, "clause_#{str_buf}".to_sym)
@@ -1845,8 +2138,8 @@ _match:
     }
   }
 	break;
-	case 29:
-#line 356 "querybuilder_ext.rl"
+	case 30:
+#line 363 "querybuilder_ext.rl"
 	{
     p = p - 3;
     if (p < data) p = data;
@@ -1854,7 +2147,7 @@ _match:
     rb_raise(rb_SyntaxError, "Syntax error near %s.", RSTRING_PTR(rb_str_inspect(rb_str_new(p , pe - p - 1))));
   }
 	break;
-#line 1858 "querybuilder_ext.c"
+#line 2151 "querybuilder_ext.c"
 		}
 	}
 
@@ -1870,8 +2163,8 @@ _again:
 	unsigned int __nacts = (unsigned int) *__acts++;
 	while ( __nacts-- > 0 ) {
 		switch ( *__acts++ ) {
-	case 29:
-#line 356 "querybuilder_ext.rl"
+	case 30:
+#line 363 "querybuilder_ext.rl"
 	{
     p = p - 3;
     if (p < data) p = data;
@@ -1879,7 +2172,7 @@ _again:
     rb_raise(rb_SyntaxError, "Syntax error near %s.", RSTRING_PTR(rb_str_inspect(rb_str_new(p , pe - p - 1))));
   }
 	break;
-#line 1883 "querybuilder_ext.c"
+#line 2176 "querybuilder_ext.c"
 		}
 	}
 	}
@@ -1887,7 +2180,7 @@ _again:
 	_out: {}
 	}
 
-#line 412 "querybuilder_ext.rl"
+#line 419 "querybuilder_ext.rl"
 
   // raise QueryBuilder::SyntaxError.new("Syntax error near #{data[p..-2].inspect}.") if p != pe
   if (p < pe) {