From f7c10036602a94bc8d24422899b62a43bf3af073 Mon Sep 17 00:00:00 2001
From: Michael Descy <mjdescy@gmail.com>
Date: Tue, 9 Aug 2016 17:26:36 -0400
Subject: [PATCH 01/11] Closes recurring task bug #113.

- Recurring tasks with priority and creation date no longer append part of the task's creation date to the new recurring task.
---
 TodoTxtMac/TTMTask.m | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/TodoTxtMac/TTMTask.m b/TodoTxtMac/TTMTask.m
index 70ddfde..1b915f9 100644
--- a/TodoTxtMac/TTMTask.m
+++ b/TodoTxtMac/TTMTask.m
@@ -60,7 +60,9 @@ @implementation TTMTask
 static NSString * const CompletionDatePattern = @"(?<=^x[ ])((\\d{4})-(\\d{2})-(\\d{2}))(?=[ ]|$)";
 static NSString * const PriorityTextPattern = @"^(\\([A-Z]\\)[ ])";
 static NSString * const CreationDatePatternIncomplete = @"(?<=^|\\([A-Z]\\)[ ])((\\d{4})-(\\d{2})-(\\d{2}))(?=[ ]|$)";
+static NSString * const CreationDatePatternIncompletePlusTrailingSpace = @"(?<=^|\\([A-Z]\\)[ ])((\\d{4})-(\\d{2})-(\\d{2}))([ ]|$)";
 static NSString * const CreationDatePatternCompleted = @"(?<=^x[ ]((\\d{4})-(\\d{2})-(\\d{2}))[ ])((\\d{4})-(\\d{2})-(\\d{2}))(?=[ ]|$)";
+static NSString * const CreationDatePatternCompletedPlusTrailingSpace = @"(?<=^x[ ]((\\d{4})-(\\d{2})-(\\d{2}))[ ])((\\d{4})-(\\d{2})-(\\d{2}))(?=[ ]|$)";
 static NSString * const DueDatePattern = @"(?<=(^|[ ])due:)((\\d{4})-(\\d{2})-(\\d{2}))(?=[ ]|$)";
 static NSString * const FullDueDatePatternMiddleOrEnd = @"(([ ])due:)((\\d{4})-(\\d{2})-(\\d{2}))(?=[ ]|$)";
 static NSString * const FullDueDatePatternBeginning = @"^due:((\\d{4})-(\\d{2})-(\\d{2}))[ ]?|$";
@@ -833,9 +835,9 @@ - (void)removeCreationDate {
     
     NSString *newRawText;
     if (!self.isCompleted) {
-        newRawText = [self.rawText substringFromIndex:11];
+        newRawText = [self.rawText replace:RX(CreationDatePatternIncompletePlusTrailingSpace) with:@""];
     } else {
-        newRawText = [self.rawText replace:RX(CreationDatePatternCompleted) with:@""];
+        newRawText = [self.rawText replace:RX(CreationDatePatternCompletedPlusTrailingSpace) with:@""];
     }
     self.rawText = newRawText;
 }

From 4b741c980a2f92a7aa20a3ac96ed3333b82fb3e0 Mon Sep 17 00:00:00 2001
From: Michael Descy <mjdescy@gmail.com>
Date: Tue, 9 Aug 2016 20:21:17 -0400
Subject: [PATCH 02/11] Fixed preference window sizing bug that cut off bottom
 of "Application behaviors" box.

---
 TodoTxtMac/TTMPreferences.xib | 68 +++++++++++++++++------------------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/TodoTxtMac/TTMPreferences.xib b/TodoTxtMac/TTMPreferences.xib
index 4b044f0..3345936 100644
--- a/TodoTxtMac/TTMPreferences.xib
+++ b/TodoTxtMac/TTMPreferences.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10116" systemVersion="15E65" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="15G31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10116"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
         <capability name="box content view" minToolsVersion="7.0"/>
         <capability name="stacking Non-gravity area distributions on NSStackView" minToolsVersion="7.0" minSystemVersion="10.11"/>
     </dependencies>
@@ -20,38 +20,38 @@
         <window title="TodoTxtMac Preferences" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="QvC-M9-y7g">
             <windowStyleMask key="styleMask" titled="YES" closable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
-            <rect key="contentRect" x="196" y="240" width="630" height="473"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1440" height="877"/>
-            <view key="contentView" id="EiT-Mj-1SZ">
-                <rect key="frame" x="0.0" y="0.0" width="630" height="473"/>
+            <rect key="contentRect" x="196" y="240" width="630" height="468"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/>
+            <view key="contentView" misplaced="YES" id="EiT-Mj-1SZ">
+                <rect key="frame" x="0.0" y="0.0" width="630" height="468"/>
                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                 <subviews>
-                    <tabView translatesAutoresizingMaskIntoConstraints="NO" id="y76-Kz-NYB">
-                        <rect key="frame" x="3" y="0.0" width="624" height="469"/>
+                    <tabView verticalCompressionResistancePriority="751" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="y76-Kz-NYB">
+                        <rect key="frame" x="3" y="20" width="624" height="444"/>
                         <font key="font" metaFont="system"/>
                         <tabViewItems>
                             <tabViewItem label="Files" identifier="0" id="L8o-bt-LMa" userLabel="Files">
                                 <view key="view" id="kDW-tT-Mxi">
-                                    <rect key="frame" x="10" y="33" width="604" height="423"/>
+                                    <rect key="frame" x="10" y="33" width="604" height="398"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
                                         <stackView distribution="fillProportionally" orientation="vertical" alignment="leading" spacing="12" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="6Ky-Vz-equ">
-                                            <rect key="frame" x="10" y="10" width="584" height="403"/>
+                                            <rect key="frame" x="10" y="10" width="584" height="378"/>
                                             <subviews>
                                                 <box title="Default todo.txt file (optional)" borderType="line" translatesAutoresizingMaskIntoConstraints="NO" id="fTt-8Z-Eaa" userLabel="Default todo.txt file Box">
-                                                    <rect key="frame" x="7" y="204" width="570" height="200"/>
+                                                    <rect key="frame" x="7" y="191" width="570" height="187"/>
                                                     <view key="contentView" id="rip-cf-LYb">
-                                                        <rect key="frame" x="1" y="1" width="568" height="184"/>
+                                                        <rect key="frame" x="1" y="1" width="568" height="171"/>
                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                         <subviews>
                                                             <stackView distribution="fill" orientation="vertical" alignment="leading" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Xxd-gI-kIv">
-                                                                <rect key="frame" x="10" y="110" width="548" height="64"/>
+                                                                <rect key="frame" x="10" y="97" width="548" height="64"/>
                                                                 <subviews>
                                                                     <stackView orientation="horizontal" alignment="centerY" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="QEV-IA-Nkb" userLabel="Default File Stack View">
                                                                         <rect key="frame" x="0.0" y="22" width="548" height="42"/>
                                                                         <beginningViews>
-                                                                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ibn-uO-HXl">
-                                                                                <rect key="frame" x="-2" y="12" width="76" height="17"/>
+                                                                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ibn-uO-HXl">
+                                                                                <rect key="frame" x="-2" y="12.5" width="74" height="17"/>
                                                                                 <constraints>
                                                                                     <constraint firstAttribute="width" constant="72" id="Mdu-XM-INb"/>
                                                                                 </constraints>
@@ -63,8 +63,8 @@
                                                                             </textField>
                                                                         </beginningViews>
                                                                         <middleViews>
-                                                                            <textField horizontalHuggingPriority="1" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="8Tp-oa-L2w">
-                                                                                <rect key="frame" x="92" y="0.0" width="364" height="42"/>
+                                                                            <textField horizontalHuggingPriority="1" verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="8Tp-oa-L2w">
+                                                                                <rect key="frame" x="92" y="11.5" width="364" height="19"/>
                                                                                 <constraints>
                                                                                     <constraint firstAttribute="height" constant="42" id="tpc-B7-pDs"/>
                                                                                 </constraints>
@@ -144,19 +144,19 @@
                                                     <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                                 </box>
                                                 <box title="Archive file (done.txt)" borderType="line" translatesAutoresizingMaskIntoConstraints="NO" id="BF2-7M-dnr" userLabel="Archive file (done.txt) Box">
-                                                    <rect key="frame" x="7" y="-4" width="570" height="200"/>
+                                                    <rect key="frame" x="7" y="-4" width="570" height="187"/>
                                                     <view key="contentView" id="WrR-WC-GsK">
-                                                        <rect key="frame" x="1" y="1" width="568" height="184"/>
+                                                        <rect key="frame" x="1" y="1" width="568" height="171"/>
                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                         <subviews>
                                                             <stackView distribution="fill" orientation="vertical" alignment="leading" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="sfr-8a-zUH">
-                                                                <rect key="frame" x="10" y="110" width="548" height="64"/>
+                                                                <rect key="frame" x="10" y="97" width="548" height="64"/>
                                                                 <subviews>
                                                                     <stackView orientation="horizontal" alignment="centerY" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="3oP-vL-K4R" userLabel="Archive File Stack View">
                                                                         <rect key="frame" x="0.0" y="22" width="548" height="42"/>
                                                                         <beginningViews>
                                                                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="EbF-No-8Sl">
-                                                                                <rect key="frame" x="-2" y="12" width="76" height="17"/>
+                                                                                <rect key="frame" x="-2" y="12.5" width="76" height="17"/>
                                                                                 <constraints>
                                                                                     <constraint firstAttribute="width" constant="72" id="ipS-TD-5uu"/>
                                                                                 </constraints>
@@ -168,8 +168,8 @@
                                                                             </textField>
                                                                         </beginningViews>
                                                                         <middleViews>
-                                                                            <textField horizontalHuggingPriority="1" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="kLG-5x-TgF">
-                                                                                <rect key="frame" x="92" y="0.0" width="364" height="42"/>
+                                                                            <textField horizontalHuggingPriority="1" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="kLG-5x-TgF">
+                                                                                <rect key="frame" x="92" y="11.5" width="364" height="19"/>
                                                                                 <constraints>
                                                                                     <constraint firstAttribute="height" constant="42" id="hcI-Nb-Xph"/>
                                                                                 </constraints>
@@ -272,20 +272,20 @@
                             </tabViewItem>
                             <tabViewItem label="Behavior" identifier="6" id="QYf-9f-Vd3" userLabel="Behavior">
                                 <view key="view" id="ADq-m3-TeV">
-                                    <rect key="frame" x="10" y="33" width="604" height="423"/>
+                                    <rect key="frame" x="10" y="33" width="604" height="398"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
-                                        <stackView distribution="fillProportionally" orientation="vertical" alignment="leading" spacing="12" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="uWq-47-nKi">
-                                            <rect key="frame" x="10" y="10" width="584" height="403"/>
+                                        <stackView distribution="fillProportionally" orientation="vertical" alignment="leading" spacing="12" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" misplaced="YES" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="uWq-47-nKi">
+                                            <rect key="frame" x="10" y="10" width="584" height="378"/>
                                             <subviews>
-                                                <box title="Application behaviors" borderType="line" translatesAutoresizingMaskIntoConstraints="NO" id="yed-2J-abW" userLabel="Application Behaviors Box">
-                                                    <rect key="frame" x="7" y="220" width="570" height="183"/>
+                                                <box misplaced="YES" title="Application behaviors" borderType="line" translatesAutoresizingMaskIntoConstraints="NO" id="yed-2J-abW" userLabel="Application Behaviors Box">
+                                                    <rect key="frame" x="7" y="220" width="570" height="158"/>
                                                     <view key="contentView" id="9wR-vg-DnJ">
-                                                        <rect key="frame" x="1" y="1" width="568" height="167"/>
+                                                        <rect key="frame" x="1" y="1" width="568" height="142"/>
                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                         <subviews>
-                                                            <stackView distribution="fill" orientation="vertical" alignment="leading" spacing="12" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="shz-AI-b3R">
-                                                                <rect key="frame" x="10" y="13" width="548" height="144"/>
+                                                            <stackView distribution="fill" orientation="vertical" alignment="leading" spacing="12" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" misplaced="YES" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="shz-AI-b3R">
+                                                                <rect key="frame" x="10" y="-12" width="548" height="144"/>
                                                                 <subviews>
                                                                     <button verticalHuggingPriority="249" translatesAutoresizingMaskIntoConstraints="NO" id="jj2-Ob-EWZ">
                                                                         <rect key="frame" x="-2" y="128" width="246" height="18"/>
@@ -822,7 +822,7 @@
                                                                                                     <rect key="frame" x="0.0" y="41" width="256" height="33"/>
                                                                                                     <subviews>
                                                                                                         <button toolTip="Tags are &quot;key:value&quot; pairs." translatesAutoresizingMaskIntoConstraints="NO" id="H2T-43-uze">
-                                                                                                            <rect key="frame" x="-2" y="7" width="127" height="18"/>
+                                                                                                            <rect key="frame" x="-2" y="8" width="127" height="18"/>
                                                                                                             <buttonCell key="cell" type="check" title="Tags" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="oCR-Hh-sAn">
                                                                                                                 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                                                                                                 <font key="font" metaFont="system"/>
@@ -988,7 +988,7 @@
                                                                                                     <rect key="frame" x="0.0" y="82" width="256" height="33"/>
                                                                                                     <subviews>
                                                                                                         <button toolTip="Threshold dates must be in the format &quot;t:YYYY-MM-DD&quot;." translatesAutoresizingMaskIntoConstraints="NO" id="Dvn-44-EkF">
-                                                                                                            <rect key="frame" x="-2" y="7" width="127" height="18"/>
+                                                                                                            <rect key="frame" x="-2" y="8" width="127" height="18"/>
                                                                                                             <buttonCell key="cell" type="check" title="Threshold dates" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="8Ot-rG-fIl">
                                                                                                                 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                                                                                                 <font key="font" metaFont="system"/>
@@ -1031,7 +1031,7 @@
                                                                                                     <rect key="frame" x="0.0" y="41" width="256" height="33"/>
                                                                                                     <subviews>
                                                                                                         <button toolTip="Threshold dates must be in the format &quot;t:YYYY-MM-DD&quot;." translatesAutoresizingMaskIntoConstraints="NO" id="DCH-Hu-Ffj">
-                                                                                                            <rect key="frame" x="-2" y="7" width="127" height="18"/>
+                                                                                                            <rect key="frame" x="-2" y="8" width="127" height="18"/>
                                                                                                             <buttonCell key="cell" type="check" title="Creation dates" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="yMp-g6-Vnj">
                                                                                                                 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                                                                                                 <font key="font" metaFont="system"/>

From e92faf7c79285405d6c04a872db687fec2ef1d10 Mon Sep 17 00:00:00 2001
From: Michael Descy <mjdescy@gmail.com>
Date: Tue, 9 Aug 2016 20:30:26 -0400
Subject: [PATCH 03/11] Adjusted height of todo.txt file and done.txt file
 boxes in Preferences window, to silence autolayout warnings.

---
 TodoTxtMac/TTMPreferences.xib | 63 ++++++++++++++++-------------------
 1 file changed, 29 insertions(+), 34 deletions(-)

diff --git a/TodoTxtMac/TTMPreferences.xib b/TodoTxtMac/TTMPreferences.xib
index 3345936..15574e9 100644
--- a/TodoTxtMac/TTMPreferences.xib
+++ b/TodoTxtMac/TTMPreferences.xib
@@ -22,39 +22,36 @@
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="196" y="240" width="630" height="468"/>
             <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/>
-            <view key="contentView" misplaced="YES" id="EiT-Mj-1SZ">
+            <view key="contentView" id="EiT-Mj-1SZ">
                 <rect key="frame" x="0.0" y="0.0" width="630" height="468"/>
                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                 <subviews>
-                    <tabView verticalCompressionResistancePriority="751" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="y76-Kz-NYB">
-                        <rect key="frame" x="3" y="20" width="624" height="444"/>
+                    <tabView verticalCompressionResistancePriority="751" translatesAutoresizingMaskIntoConstraints="NO" id="y76-Kz-NYB">
+                        <rect key="frame" x="3" y="0.0" width="624" height="464"/>
                         <font key="font" metaFont="system"/>
                         <tabViewItems>
                             <tabViewItem label="Files" identifier="0" id="L8o-bt-LMa" userLabel="Files">
                                 <view key="view" id="kDW-tT-Mxi">
-                                    <rect key="frame" x="10" y="33" width="604" height="398"/>
+                                    <rect key="frame" x="10" y="33" width="604" height="418"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
                                         <stackView distribution="fillProportionally" orientation="vertical" alignment="leading" spacing="12" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="6Ky-Vz-equ">
-                                            <rect key="frame" x="10" y="10" width="584" height="378"/>
+                                            <rect key="frame" x="10" y="10" width="584" height="398"/>
                                             <subviews>
                                                 <box title="Default todo.txt file (optional)" borderType="line" translatesAutoresizingMaskIntoConstraints="NO" id="fTt-8Z-Eaa" userLabel="Default todo.txt file Box">
-                                                    <rect key="frame" x="7" y="191" width="570" height="187"/>
+                                                    <rect key="frame" x="7" y="201" width="570" height="197"/>
                                                     <view key="contentView" id="rip-cf-LYb">
-                                                        <rect key="frame" x="1" y="1" width="568" height="171"/>
+                                                        <rect key="frame" x="1" y="1" width="568" height="181"/>
                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                         <subviews>
                                                             <stackView distribution="fill" orientation="vertical" alignment="leading" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Xxd-gI-kIv">
-                                                                <rect key="frame" x="10" y="97" width="548" height="64"/>
+                                                                <rect key="frame" x="10" y="130" width="548" height="41"/>
                                                                 <subviews>
                                                                     <stackView orientation="horizontal" alignment="centerY" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="QEV-IA-Nkb" userLabel="Default File Stack View">
-                                                                        <rect key="frame" x="0.0" y="22" width="548" height="42"/>
+                                                                        <rect key="frame" x="0.0" y="22" width="548" height="19"/>
                                                                         <beginningViews>
-                                                                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ibn-uO-HXl">
-                                                                                <rect key="frame" x="-2" y="12.5" width="74" height="17"/>
-                                                                                <constraints>
-                                                                                    <constraint firstAttribute="width" constant="72" id="Mdu-XM-INb"/>
-                                                                                </constraints>
+                                                                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ibn-uO-HXl">
+                                                                                <rect key="frame" x="-2" y="1" width="74" height="17"/>
                                                                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Default file:" id="E9J-yc-K3H">
                                                                                     <font key="font" metaFont="system"/>
                                                                                     <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -63,10 +60,10 @@
                                                                             </textField>
                                                                         </beginningViews>
                                                                         <middleViews>
-                                                                            <textField horizontalHuggingPriority="1" verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="8Tp-oa-L2w">
-                                                                                <rect key="frame" x="92" y="11.5" width="364" height="19"/>
+                                                                            <textField horizontalHuggingPriority="1" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="8Tp-oa-L2w">
+                                                                                <rect key="frame" x="92" y="0.0" width="364" height="19"/>
                                                                                 <constraints>
-                                                                                    <constraint firstAttribute="height" constant="42" id="tpc-B7-pDs"/>
+                                                                                    <constraint firstAttribute="height" constant="19" id="tpc-B7-pDs"/>
                                                                                 </constraints>
                                                                                 <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" title="Default File" placeholderString="Default file (todo.txt)" drawsBackground="YES" id="mqs-ny-Nb9">
                                                                                     <font key="font" metaFont="smallSystem"/>
@@ -80,7 +77,7 @@
                                                                         </middleViews>
                                                                         <endViews>
                                                                             <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Tzr-c2-lHB">
-                                                                                <rect key="frame" x="458" y="3.5" width="96" height="32"/>
+                                                                                <rect key="frame" x="458" y="-7" width="96" height="30"/>
                                                                                 <buttonCell key="cell" type="push" title="Browse..." bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="1Od-IU-0xH">
                                                                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                                                     <font key="font" metaFont="system"/>
@@ -93,7 +90,6 @@
                                                                         <constraints>
                                                                             <constraint firstItem="8Tp-oa-L2w" firstAttribute="top" secondItem="QEV-IA-Nkb" secondAttribute="top" id="1Ob-RU-3IH"/>
                                                                             <constraint firstAttribute="bottom" secondItem="8Tp-oa-L2w" secondAttribute="bottom" id="5Ny-KV-p0N"/>
-                                                                            <constraint firstAttribute="height" constant="42" id="dvJ-bI-QfB"/>
                                                                         </constraints>
                                                                         <visibilityPriorities>
                                                                             <integer value="1000"/>
@@ -144,19 +140,19 @@
                                                     <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                                 </box>
                                                 <box title="Archive file (done.txt)" borderType="line" translatesAutoresizingMaskIntoConstraints="NO" id="BF2-7M-dnr" userLabel="Archive file (done.txt) Box">
-                                                    <rect key="frame" x="7" y="-4" width="570" height="187"/>
+                                                    <rect key="frame" x="7" y="-4" width="570" height="197"/>
                                                     <view key="contentView" id="WrR-WC-GsK">
-                                                        <rect key="frame" x="1" y="1" width="568" height="171"/>
+                                                        <rect key="frame" x="1" y="1" width="568" height="181"/>
                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                         <subviews>
                                                             <stackView distribution="fill" orientation="vertical" alignment="leading" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="sfr-8a-zUH">
-                                                                <rect key="frame" x="10" y="97" width="548" height="64"/>
+                                                                <rect key="frame" x="10" y="130" width="548" height="41"/>
                                                                 <subviews>
                                                                     <stackView orientation="horizontal" alignment="centerY" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="3oP-vL-K4R" userLabel="Archive File Stack View">
-                                                                        <rect key="frame" x="0.0" y="22" width="548" height="42"/>
+                                                                        <rect key="frame" x="0.0" y="22" width="548" height="19"/>
                                                                         <beginningViews>
                                                                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="EbF-No-8Sl">
-                                                                                <rect key="frame" x="-2" y="12.5" width="76" height="17"/>
+                                                                                <rect key="frame" x="-2" y="1" width="76" height="17"/>
                                                                                 <constraints>
                                                                                     <constraint firstAttribute="width" constant="72" id="ipS-TD-5uu"/>
                                                                                 </constraints>
@@ -168,10 +164,10 @@
                                                                             </textField>
                                                                         </beginningViews>
                                                                         <middleViews>
-                                                                            <textField horizontalHuggingPriority="1" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="kLG-5x-TgF">
-                                                                                <rect key="frame" x="92" y="11.5" width="364" height="19"/>
+                                                                            <textField horizontalHuggingPriority="1" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="kLG-5x-TgF">
+                                                                                <rect key="frame" x="92" y="0.0" width="364" height="19"/>
                                                                                 <constraints>
-                                                                                    <constraint firstAttribute="height" constant="42" id="hcI-Nb-Xph"/>
+                                                                                    <constraint firstAttribute="height" constant="19" id="hcI-Nb-Xph"/>
                                                                                 </constraints>
                                                                                 <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" borderStyle="bezel" title="Archive file" placeholderString="Archive file (done.txt)" drawsBackground="YES" id="ER5-Fw-tUr">
                                                                                     <font key="font" metaFont="smallSystem"/>
@@ -185,7 +181,7 @@
                                                                         </middleViews>
                                                                         <endViews>
                                                                             <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="7Xb-Wn-oSq">
-                                                                                <rect key="frame" x="458" y="3.5" width="96" height="32"/>
+                                                                                <rect key="frame" x="458" y="-7" width="96" height="30"/>
                                                                                 <buttonCell key="cell" type="push" title="Browse..." bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="Hif-CU-wHj">
                                                                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                                                     <font key="font" metaFont="system"/>
@@ -197,7 +193,6 @@
                                                                         </endViews>
                                                                         <constraints>
                                                                             <constraint firstItem="kLG-5x-TgF" firstAttribute="top" secondItem="3oP-vL-K4R" secondAttribute="top" id="9hK-rh-lNF"/>
-                                                                            <constraint firstAttribute="height" constant="42" id="JiB-sh-Gzk"/>
                                                                             <constraint firstAttribute="bottom" secondItem="kLG-5x-TgF" secondAttribute="bottom" id="bEg-Vf-BHP"/>
                                                                         </constraints>
                                                                         <visibilityPriorities>
@@ -275,16 +270,16 @@
                                     <rect key="frame" x="10" y="33" width="604" height="398"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
-                                        <stackView distribution="fillProportionally" orientation="vertical" alignment="leading" spacing="12" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" misplaced="YES" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="uWq-47-nKi">
+                                        <stackView distribution="fillProportionally" orientation="vertical" alignment="leading" spacing="12" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="uWq-47-nKi">
                                             <rect key="frame" x="10" y="10" width="584" height="378"/>
                                             <subviews>
-                                                <box misplaced="YES" title="Application behaviors" borderType="line" translatesAutoresizingMaskIntoConstraints="NO" id="yed-2J-abW" userLabel="Application Behaviors Box">
+                                                <box title="Application behaviors" borderType="line" translatesAutoresizingMaskIntoConstraints="NO" id="yed-2J-abW" userLabel="Application Behaviors Box">
                                                     <rect key="frame" x="7" y="220" width="570" height="158"/>
                                                     <view key="contentView" id="9wR-vg-DnJ">
                                                         <rect key="frame" x="1" y="1" width="568" height="142"/>
                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                         <subviews>
-                                                            <stackView distribution="fill" orientation="vertical" alignment="leading" spacing="12" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" misplaced="YES" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="shz-AI-b3R">
+                                                            <stackView distribution="fill" orientation="vertical" alignment="leading" spacing="12" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="shz-AI-b3R">
                                                                 <rect key="frame" x="10" y="-12" width="548" height="144"/>
                                                                 <subviews>
                                                                     <button verticalHuggingPriority="249" translatesAutoresizingMaskIntoConstraints="NO" id="jj2-Ob-EWZ">
@@ -1221,11 +1216,11 @@
                             </tabViewItem>
                             <tabViewItem label="Status Bar" identifier="3" id="C0X-lJ-CYs">
                                 <view key="view" id="Xxm-Vu-L8l">
-                                    <rect key="frame" x="10" y="33" width="604" height="423"/>
+                                    <rect key="frame" x="10" y="33" width="604" height="398"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
                                         <box autoresizesSubviews="NO" title="Customize status bar" borderType="line" translatesAutoresizingMaskIntoConstraints="NO" id="uP8-O5-g7a" userLabel="Customize status bar Box">
-                                            <rect key="frame" x="7" y="189" width="590" height="224"/>
+                                            <rect key="frame" x="7" y="164" width="590" height="224"/>
                                             <view key="contentView" id="8uo-5X-lZk">
                                                 <rect key="frame" x="1" y="1" width="588" height="208"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>

From 7e64749cece168ed67cf9838506301f3ca1ed27f Mon Sep 17 00:00:00 2001
From: Michael Descy <mjdescy@gmail.com>
Date: Tue, 9 Aug 2016 22:10:55 -0400
Subject: [PATCH 04/11] Closes Issue #115: Editing the currently active filter
 does not apply file changes to filtered task lists automatically.

- Also added Command+} and Command+{ keyboard shortcuts to Filter window for next tab/previous tab. These keyboard shortcuts do not currently work when a text view is being edited in the predicate editor.
---
 TodoTxtMac/TTMFilters.xib         | 61 +++++++++++++++++++------------
 TodoTxtMac/TTMFiltersController.h | 14 ++++++-
 TodoTxtMac/TTMFiltersController.m | 38 ++++++++++++++++++-
 TodoTxtMac/TTMPreferences.xib     |  6 +--
 4 files changed, 91 insertions(+), 28 deletions(-)

diff --git a/TodoTxtMac/TTMFilters.xib b/TodoTxtMac/TTMFilters.xib
index 0f72473..8504436 100644
--- a/TodoTxtMac/TTMFilters.xib
+++ b/TodoTxtMac/TTMFilters.xib
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10116" systemVersion="15E65" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="15G31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10116"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
         <capability name="stacking Non-gravity area distributions on NSStackView" minToolsVersion="7.0" minSystemVersion="10.11"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="TTMFiltersController">
             <connections>
+                <outlet property="appController" destination="btd-hr-xBM" id="Kwx-U8-bkO"/>
                 <outlet property="filter1PredicateEditor" destination="kyY-lA-F0K" id="b2T-Mm-XvS"/>
                 <outlet property="filter2PredicateEditor" destination="Ymr-Te-Jsu" id="GBd-RX-7pM"/>
                 <outlet property="filter3PredicateEditor" destination="6q7-hn-dBp" id="Nqb-rK-hpg"/>
@@ -17,6 +18,7 @@
                 <outlet property="filter7PredicateEditor" destination="abs-37-qFl" id="fj0-JR-Rfd"/>
                 <outlet property="filter8PredicateEditor" destination="m5a-mt-V4E" id="gPm-Qt-bVw"/>
                 <outlet property="filter9PredicateEditor" destination="XsA-Sd-hjN" id="jJf-J4-emJ"/>
+                <outlet property="tabView" destination="qgL-I9-GFI" id="l0a-Rd-nwu"/>
                 <outlet property="window" destination="QvC-M9-y7g" id="2Wz-Uh-Jdi"/>
             </connections>
         </customObject>
@@ -26,7 +28,7 @@
             <windowStyleMask key="styleMask" titled="YES" closable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="196" y="240" width="573" height="386"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1440" height="877"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/>
             <view key="contentView" id="EiT-Mj-1SZ">
                 <rect key="frame" x="0.0" y="0.0" width="573" height="386"/>
                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -531,6 +533,7 @@
                                                                     </predicateEditorRowTemplate>
                                                                 </rowTemplates>
                                                                 <connections>
+                                                                    <action selector="refreshTaskListFilters:" target="-2" id="XCy-xA-giF"/>
                                                                     <binding destination="VIO-0n-UUv" name="value" keyPath="values.filterPredicate1" id="nNL-eP-zci">
                                                                         <dictionary key="options">
                                                                             <string key="NSValueTransformerName">NSKeyedUnarchiveFromData</string>
@@ -546,7 +549,7 @@
                                                         <autoresizingMask key="autoresizingMask"/>
                                                     </scroller>
                                                     <scroller key="verticalScroller" verticalHuggingPriority="750" horizontal="NO" id="tcy-Zc-P6i">
-                                                        <rect key="frame" x="476" y="1" width="16" height="256"/>
+                                                        <rect key="frame" x="477" y="1" width="15" height="256"/>
                                                         <autoresizingMask key="autoresizingMask"/>
                                                     </scroller>
                                                 </scrollView>
@@ -561,13 +564,13 @@
                                     </tabViewItem>
                                     <tabViewItem label="2" identifier="2" id="PCm-V3-9tb">
                                         <view key="view" id="J97-zb-W9K">
-                                            <rect key="frame" x="10" y="33" width="527" height="280"/>
+                                            <rect key="frame" x="10" y="33" width="527" height="278"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             <subviews>
                                                 <scrollView autohidesScrollers="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gV7-vJ-B61">
-                                                    <rect key="frame" x="17" y="17" width="493" height="260"/>
+                                                    <rect key="frame" x="17" y="17" width="493" height="258"/>
                                                     <clipView key="contentView" id="6so-Zw-0Bg">
-                                                        <rect key="frame" x="1" y="1" width="491" height="258"/>
+                                                        <rect key="frame" x="1" y="1" width="476" height="256"/>
                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                         <subviews>
                                                             <predicateEditor verticalHuggingPriority="750" nestingMode="compound" rowHeight="25" id="Ymr-Te-Jsu">
@@ -1049,6 +1052,7 @@
                                                                     </predicateEditorRowTemplate>
                                                                 </rowTemplates>
                                                                 <connections>
+                                                                    <action selector="refreshTaskListFilters:" target="-2" id="uh5-Xj-2kQ"/>
                                                                     <binding destination="VIO-0n-UUv" name="value" keyPath="values.filterPredicate2" id="xSl-H6-No6">
                                                                         <dictionary key="options">
                                                                             <string key="NSValueTransformerName">NSKeyedUnarchiveFromData</string>
@@ -1064,7 +1068,7 @@
                                                         <autoresizingMask key="autoresizingMask"/>
                                                     </scroller>
                                                     <scroller key="verticalScroller" verticalHuggingPriority="750" horizontal="NO" id="vAx-J9-pQC">
-                                                        <rect key="frame" x="476" y="1" width="16" height="258"/>
+                                                        <rect key="frame" x="477" y="1" width="15" height="256"/>
                                                         <autoresizingMask key="autoresizingMask"/>
                                                     </scroller>
                                                 </scrollView>
@@ -1079,13 +1083,13 @@
                                     </tabViewItem>
                                     <tabViewItem label="3" identifier="3" id="R1s-iN-eeA">
                                         <view key="view" id="RwD-XB-Zgj">
-                                            <rect key="frame" x="10" y="33" width="527" height="280"/>
+                                            <rect key="frame" x="10" y="33" width="527" height="278"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             <subviews>
                                                 <scrollView autohidesScrollers="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Rl5-k4-2Qu">
-                                                    <rect key="frame" x="17" y="17" width="493" height="260"/>
+                                                    <rect key="frame" x="17" y="17" width="493" height="258"/>
                                                     <clipView key="contentView" id="heN-Oz-PCI">
-                                                        <rect key="frame" x="1" y="1" width="491" height="258"/>
+                                                        <rect key="frame" x="1" y="1" width="476" height="256"/>
                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                         <subviews>
                                                             <predicateEditor verticalHuggingPriority="750" nestingMode="compound" rowHeight="25" id="6q7-hn-dBp">
@@ -1567,6 +1571,7 @@
                                                                     </predicateEditorRowTemplate>
                                                                 </rowTemplates>
                                                                 <connections>
+                                                                    <action selector="refreshTaskListFilters:" target="-2" id="P5d-MF-WGV"/>
                                                                     <binding destination="VIO-0n-UUv" name="value" keyPath="values.filterPredicate3" id="mxZ-7U-OEE">
                                                                         <dictionary key="options">
                                                                             <string key="NSValueTransformerName">NSKeyedUnarchiveFromData</string>
@@ -1582,7 +1587,7 @@
                                                         <autoresizingMask key="autoresizingMask"/>
                                                     </scroller>
                                                     <scroller key="verticalScroller" verticalHuggingPriority="750" horizontal="NO" id="ues-cY-hv0">
-                                                        <rect key="frame" x="476" y="1" width="16" height="258"/>
+                                                        <rect key="frame" x="477" y="1" width="15" height="256"/>
                                                         <autoresizingMask key="autoresizingMask"/>
                                                     </scroller>
                                                 </scrollView>
@@ -1597,13 +1602,13 @@
                                     </tabViewItem>
                                     <tabViewItem label="4" identifier="4" id="zei-mw-Cwn">
                                         <view key="view" id="oUE-Dl-Rpo">
-                                            <rect key="frame" x="10" y="33" width="527" height="280"/>
+                                            <rect key="frame" x="10" y="33" width="527" height="278"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             <subviews>
                                                 <scrollView autohidesScrollers="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ahb-tN-8y0">
-                                                    <rect key="frame" x="17" y="17" width="493" height="260"/>
+                                                    <rect key="frame" x="17" y="17" width="493" height="258"/>
                                                     <clipView key="contentView" id="OMr-xw-FM3">
-                                                        <rect key="frame" x="1" y="1" width="491" height="258"/>
+                                                        <rect key="frame" x="1" y="1" width="476" height="256"/>
                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                         <subviews>
                                                             <predicateEditor verticalHuggingPriority="750" nestingMode="compound" rowHeight="25" id="dqt-SY-XL3">
@@ -2085,6 +2090,7 @@
                                                                     </predicateEditorRowTemplate>
                                                                 </rowTemplates>
                                                                 <connections>
+                                                                    <action selector="refreshTaskListFilters:" target="-2" id="Sib-1U-PvT"/>
                                                                     <binding destination="VIO-0n-UUv" name="value" keyPath="values.filterPredicate4" id="dcI-bd-T3G">
                                                                         <dictionary key="options">
                                                                             <string key="NSValueTransformerName">NSKeyedUnarchiveFromData</string>
@@ -2100,7 +2106,7 @@
                                                         <autoresizingMask key="autoresizingMask"/>
                                                     </scroller>
                                                     <scroller key="verticalScroller" verticalHuggingPriority="750" horizontal="NO" id="Dn2-oy-WkD">
-                                                        <rect key="frame" x="476" y="1" width="16" height="258"/>
+                                                        <rect key="frame" x="477" y="1" width="15" height="256"/>
                                                         <autoresizingMask key="autoresizingMask"/>
                                                     </scroller>
                                                 </scrollView>
@@ -2603,6 +2609,7 @@
                                                                     </predicateEditorRowTemplate>
                                                                 </rowTemplates>
                                                                 <connections>
+                                                                    <action selector="refreshTaskListFilters:" target="-2" id="alE-yv-4uj"/>
                                                                     <binding destination="VIO-0n-UUv" name="value" keyPath="values.filterPredicate5" id="Q1e-in-vhO">
                                                                         <dictionary key="options">
                                                                             <string key="NSValueTransformerName">NSKeyedUnarchiveFromData</string>
@@ -2618,7 +2625,7 @@
                                                         <autoresizingMask key="autoresizingMask"/>
                                                     </scroller>
                                                     <scroller key="verticalScroller" verticalHuggingPriority="750" horizontal="NO" id="Xch-za-6Nr">
-                                                        <rect key="frame" x="476" y="1" width="16" height="258"/>
+                                                        <rect key="frame" x="477" y="1" width="15" height="258"/>
                                                         <autoresizingMask key="autoresizingMask"/>
                                                     </scroller>
                                                 </scrollView>
@@ -3121,6 +3128,7 @@
                                                                     </predicateEditorRowTemplate>
                                                                 </rowTemplates>
                                                                 <connections>
+                                                                    <action selector="refreshTaskListFilters:" target="-2" id="aBu-8Y-Td6"/>
                                                                     <binding destination="VIO-0n-UUv" name="value" keyPath="values.filterPredicate6" id="Lk0-wU-BwF">
                                                                         <dictionary key="options">
                                                                             <string key="NSValueTransformerName">NSKeyedUnarchiveFromData</string>
@@ -3136,7 +3144,7 @@
                                                         <autoresizingMask key="autoresizingMask"/>
                                                     </scroller>
                                                     <scroller key="verticalScroller" verticalHuggingPriority="750" horizontal="NO" id="2bq-D6-2te">
-                                                        <rect key="frame" x="476" y="1" width="16" height="258"/>
+                                                        <rect key="frame" x="477" y="1" width="15" height="258"/>
                                                         <autoresizingMask key="autoresizingMask"/>
                                                     </scroller>
                                                 </scrollView>
@@ -3639,6 +3647,7 @@
                                                                     </predicateEditorRowTemplate>
                                                                 </rowTemplates>
                                                                 <connections>
+                                                                    <action selector="refreshTaskListFilters:" target="-2" id="8mZ-rZ-i7m"/>
                                                                     <binding destination="VIO-0n-UUv" name="value" keyPath="values.filterPredicate7" id="zOI-8I-1Pk">
                                                                         <dictionary key="options">
                                                                             <string key="NSValueTransformerName">NSKeyedUnarchiveFromData</string>
@@ -3654,7 +3663,7 @@
                                                         <autoresizingMask key="autoresizingMask"/>
                                                     </scroller>
                                                     <scroller key="verticalScroller" verticalHuggingPriority="750" horizontal="NO" id="JkQ-8M-KaS">
-                                                        <rect key="frame" x="476" y="1" width="16" height="258"/>
+                                                        <rect key="frame" x="477" y="1" width="15" height="258"/>
                                                         <autoresizingMask key="autoresizingMask"/>
                                                     </scroller>
                                                 </scrollView>
@@ -4157,6 +4166,7 @@
                                                                     </predicateEditorRowTemplate>
                                                                 </rowTemplates>
                                                                 <connections>
+                                                                    <action selector="refreshTaskListFilters:" target="-2" id="ACz-HP-9Rb"/>
                                                                     <binding destination="VIO-0n-UUv" name="value" keyPath="values.filterPredicate8" id="ydF-u1-heh">
                                                                         <dictionary key="options">
                                                                             <string key="NSValueTransformerName">NSKeyedUnarchiveFromData</string>
@@ -4172,7 +4182,7 @@
                                                         <autoresizingMask key="autoresizingMask"/>
                                                     </scroller>
                                                     <scroller key="verticalScroller" verticalHuggingPriority="750" horizontal="NO" id="h5H-Ye-21u">
-                                                        <rect key="frame" x="476" y="1" width="16" height="258"/>
+                                                        <rect key="frame" x="477" y="1" width="15" height="258"/>
                                                         <autoresizingMask key="autoresizingMask"/>
                                                     </scroller>
                                                 </scrollView>
@@ -4675,6 +4685,7 @@
                                                                     </predicateEditorRowTemplate>
                                                                 </rowTemplates>
                                                                 <connections>
+                                                                    <action selector="refreshTaskListFilters:" target="-2" id="Qvy-55-CLZ"/>
                                                                     <binding destination="VIO-0n-UUv" name="value" keyPath="values.filterPredicate9" id="yYm-0Y-a5Q">
                                                                         <dictionary key="options">
                                                                             <string key="NSValueTransformerName">NSKeyedUnarchiveFromData</string>
@@ -4690,7 +4701,7 @@
                                                         <autoresizingMask key="autoresizingMask"/>
                                                     </scroller>
                                                     <scroller key="verticalScroller" verticalHuggingPriority="750" horizontal="NO" id="uW2-e6-tfL">
-                                                        <rect key="frame" x="476" y="1" width="16" height="256"/>
+                                                        <rect key="frame" x="477" y="1" width="15" height="256"/>
                                                         <autoresizingMask key="autoresizingMask"/>
                                                     </scroller>
                                                 </scrollView>
@@ -4704,14 +4715,17 @@
                                         </view>
                                     </tabViewItem>
                                 </tabViewItems>
+                                <connections>
+                                    <outlet property="delegate" destination="-2" id="8Jp-o7-Z07"/>
+                                </connections>
                             </tabView>
                             <stackView orientation="horizontal" alignment="firstBaseline" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="vFl-WV-0PG" userLabel="Button Row Stack View">
                                 <rect key="frame" x="0.0" y="0.0" width="533" height="30"/>
                                 <beginningViews>
                                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="K5U-Nz-fQB">
-                                        <rect key="frame" x="-6" y="-2" width="74" height="32"/>
+                                        <rect key="frame" x="-6" y="-2" width="75" height="32"/>
                                         <constraints>
-                                            <constraint firstAttribute="width" constant="62" id="YaC-SX-HfI"/>
+                                            <constraint firstAttribute="width" constant="63" id="YaC-SX-HfI"/>
                                         </constraints>
                                         <buttonCell key="cell" type="push" title="Close" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="fp0-Cf-XSV">
                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -4788,5 +4802,6 @@
             <point key="canvasLocation" x="232.5" y="376"/>
         </window>
         <userDefaultsController representsSharedInstance="YES" id="VIO-0n-UUv"/>
+        <customObject id="btd-hr-xBM" customClass="TTMAppController"/>
     </objects>
 </document>
diff --git a/TodoTxtMac/TTMFiltersController.h b/TodoTxtMac/TTMFiltersController.h
index 0917708..9a4f163 100644
--- a/TodoTxtMac/TTMFiltersController.h
+++ b/TodoTxtMac/TTMFiltersController.h
@@ -46,7 +46,12 @@
 
 #import <Foundation/Foundation.h>
 
-@interface TTMFiltersController : NSWindowController <NSWindowDelegate>
+@class TTMAppController;
+
+@interface TTMFiltersController : NSWindowController <NSWindowDelegate, NSTabViewDelegate>
+
+@property (nonatomic, retain) IBOutlet TTMAppController *appController;
+@property (nonatomic, retain) IBOutlet NSTabView *tabView;
 
 @property (nonatomic, retain) IBOutlet NSPredicateEditor *filter1PredicateEditor;
 @property (nonatomic, retain) IBOutlet NSPredicateEditor *filter2PredicateEditor;
@@ -64,4 +69,11 @@
  */
 - (IBAction)resetAllFilters:(id)sender;
 
+/*!
+ * @method refreshTaskListFilters:
+ * @abstract This method will cause a refresh of the filters for all open task lists.
+ */
+- (IBAction)refreshTaskListFilters:(id)sender;
+
+
 @end
diff --git a/TodoTxtMac/TTMFiltersController.m b/TodoTxtMac/TTMFiltersController.m
index df68132..0d4c0cf 100644
--- a/TodoTxtMac/TTMFiltersController.m
+++ b/TodoTxtMac/TTMFiltersController.m
@@ -46,6 +46,7 @@
 
 #import "TTMFiltersController.h"
 #import "TTMFilterPredicates.h"
+#import "TTMAppController.h"
 
 @implementation TTMFiltersController
 
@@ -83,6 +84,10 @@ - (IBAction)resetAllFilters:(id)sender {
     }];
 }
 
+- (IBAction)refreshTaskListFilters:(id)sender {
+    [self.appController visualRefreshAll:self];
+}
+
 #pragma mark - Window Delegate Methods
 
 - (BOOL)windowShouldClose:(NSWindow *)window {
@@ -90,5 +95,36 @@ - (BOOL)windowShouldClose:(NSWindow *)window {
     // closes the window without hitting enter or tab.
     return [window makeFirstResponder:nil];
 }
- 
+
+- (void)windowWillClose:(NSNotification *)notification {
+    [self refreshTaskListFilters:self];
+}
+
+- (void)keyDown:(NSEvent *)theEvent {
+    NSUInteger flags = [theEvent modifierFlags];
+    NSString *passedChar = [theEvent charactersIgnoringModifiers];
+
+    if ((flags & NSCommandKeyMask) &&
+        (flags & NSShiftKeyMask) &&
+        ([passedChar isEqualToString:@"{"])) {
+        [self.tabView selectPreviousTabViewItem:self];
+        return;
+    }
+
+    if ((flags & NSCommandKeyMask) &&
+        (flags & NSShiftKeyMask) &&
+        ([passedChar isEqualToString:@"}"])) {
+        [self.tabView selectNextTabViewItem:self];
+        return;
+    }
+
+    [super keyDown:theEvent];
+}
+
+#pragma mark - NSTabViewDelegate Delegate Methods
+
+- (void)tabView:(NSTabView *)tabView didSelectTabViewItem:(NSTabViewItem *)tabViewItem {
+    [self refreshTaskListFilters:self];
+}
+
 @end
diff --git a/TodoTxtMac/TTMPreferences.xib b/TodoTxtMac/TTMPreferences.xib
index 15574e9..fa953d7 100644
--- a/TodoTxtMac/TTMPreferences.xib
+++ b/TodoTxtMac/TTMPreferences.xib
@@ -817,7 +817,7 @@
                                                                                                     <rect key="frame" x="0.0" y="41" width="256" height="33"/>
                                                                                                     <subviews>
                                                                                                         <button toolTip="Tags are &quot;key:value&quot; pairs." translatesAutoresizingMaskIntoConstraints="NO" id="H2T-43-uze">
-                                                                                                            <rect key="frame" x="-2" y="8" width="127" height="18"/>
+                                                                                                            <rect key="frame" x="-2" y="7" width="127" height="18"/>
                                                                                                             <buttonCell key="cell" type="check" title="Tags" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="oCR-Hh-sAn">
                                                                                                                 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                                                                                                 <font key="font" metaFont="system"/>
@@ -983,7 +983,7 @@
                                                                                                     <rect key="frame" x="0.0" y="82" width="256" height="33"/>
                                                                                                     <subviews>
                                                                                                         <button toolTip="Threshold dates must be in the format &quot;t:YYYY-MM-DD&quot;." translatesAutoresizingMaskIntoConstraints="NO" id="Dvn-44-EkF">
-                                                                                                            <rect key="frame" x="-2" y="8" width="127" height="18"/>
+                                                                                                            <rect key="frame" x="-2" y="7" width="127" height="18"/>
                                                                                                             <buttonCell key="cell" type="check" title="Threshold dates" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="8Ot-rG-fIl">
                                                                                                                 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                                                                                                 <font key="font" metaFont="system"/>
@@ -1026,7 +1026,7 @@
                                                                                                     <rect key="frame" x="0.0" y="41" width="256" height="33"/>
                                                                                                     <subviews>
                                                                                                         <button toolTip="Threshold dates must be in the format &quot;t:YYYY-MM-DD&quot;." translatesAutoresizingMaskIntoConstraints="NO" id="DCH-Hu-Ffj">
-                                                                                                            <rect key="frame" x="-2" y="8" width="127" height="18"/>
+                                                                                                            <rect key="frame" x="-2" y="7" width="127" height="18"/>
                                                                                                             <buttonCell key="cell" type="check" title="Creation dates" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="yMp-g6-Vnj">
                                                                                                                 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                                                                                                 <font key="font" metaFont="system"/>

From f4883a319193ac0cf82caf6ab1ae33f2effd6251 Mon Sep 17 00:00:00 2001
From: Michael Descy <mjdescy@gmail.com>
Date: Wed, 10 Aug 2016 13:15:42 -0400
Subject: [PATCH 05/11] Changed implementation of how filters are applied when
 the filter predicates are edited in the Filters window.

- Implemented KVO of filter values in TTMDocument class.
- Added functionality to update filters in which text is being edited when the Filters window loses key (focus).
---
 TodoTxtMac/TTMDocument.m          |  84 ++++
 TodoTxtMac/TTMFilters.xib         | 761 +++++++++++++++---------------
 TodoTxtMac/TTMFiltersController.h |  10 +-
 TodoTxtMac/TTMFiltersController.m |  43 +-
 4 files changed, 475 insertions(+), 423 deletions(-)

diff --git a/TodoTxtMac/TTMDocument.m b/TodoTxtMac/TTMDocument.m
index f4d1261..fda78b0 100644
--- a/TodoTxtMac/TTMDocument.m
+++ b/TodoTxtMac/TTMDocument.m
@@ -110,6 +110,44 @@ - (void)awakeFromNib {
                                             forKeyPath:@"levelsOfUndo"
                                                options:NSKeyValueObservingOptionNew
                                                context:nil];
+
+    // Observe NSUserDefaults to update filter-related preferences
+    [[NSUserDefaults standardUserDefaults] addObserver:self
+                                            forKeyPath:@"filterPredicate1"
+                                               options:NSKeyValueObservingOptionNew
+                                               context:nil];
+    [[NSUserDefaults standardUserDefaults] addObserver:self
+                                            forKeyPath:@"filterPredicate2"
+                                               options:NSKeyValueObservingOptionNew
+                                               context:nil];
+    [[NSUserDefaults standardUserDefaults] addObserver:self
+                                            forKeyPath:@"filterPredicate3"
+                                               options:NSKeyValueObservingOptionNew
+                                               context:nil];
+    [[NSUserDefaults standardUserDefaults] addObserver:self
+                                            forKeyPath:@"filterPredicate4"
+                                               options:NSKeyValueObservingOptionNew
+                                               context:nil];
+    [[NSUserDefaults standardUserDefaults] addObserver:self
+                                            forKeyPath:@"filterPredicate5"
+                                               options:NSKeyValueObservingOptionNew
+                                               context:nil];
+    [[NSUserDefaults standardUserDefaults] addObserver:self
+                                            forKeyPath:@"filterPredicate6"
+                                               options:NSKeyValueObservingOptionNew
+                                               context:nil];
+    [[NSUserDefaults standardUserDefaults] addObserver:self
+                                            forKeyPath:@"filterPredicate7"
+                                               options:NSKeyValueObservingOptionNew
+                                               context:nil];
+    [[NSUserDefaults standardUserDefaults] addObserver:self
+                                            forKeyPath:@"filterPredicate8"
+                                               options:NSKeyValueObservingOptionNew
+                                               context:nil];
+    [[NSUserDefaults standardUserDefaults] addObserver:self
+                                            forKeyPath:@"filterPredicate9"
+                                               options:NSKeyValueObservingOptionNew
+                                               context:nil];
 }
 
 - (NSString *)windowNibName {
@@ -1442,14 +1480,60 @@ - (IBAction)hideTasklistMetadata:(id)sender {
 - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context {
     if ([keyPath isEqualToString:@"selection"]) {
         [self updateStatusBarText];
+        return;
     }
     
     if ([keyPath isEqualToString:@"searchFieldPredicate"]) {
         [self reapplyActiveFilterPredicate];
+        return;
     }
     
     if ([keyPath isEqualToString:@"levelsOfUndo"]) {
         [self.undoManager setLevelsOfUndo:[[NSUserDefaults standardUserDefaults] integerForKey:@"levelsOfUndo"]];
+        return;
+    }
+
+    if ([keyPath isEqualToString:@"filterPredicate1"]) {
+        [self visualRefreshIfFilterChangedAtPreset:1];
+        return;
+    }
+    if ([keyPath isEqualToString:@"filterPredicate2"]) {
+        [self visualRefreshIfFilterChangedAtPreset:2];
+        return;
+    }
+    if ([keyPath isEqualToString:@"filterPredicate3"]) {
+        [self visualRefreshIfFilterChangedAtPreset:3];
+        return;
+    }
+    if ([keyPath isEqualToString:@"filterPredicate4"]) {
+        [self visualRefreshIfFilterChangedAtPreset:4];
+        return;
+    }
+    if ([keyPath isEqualToString:@"filterPredicate5"]) {
+        [self visualRefreshIfFilterChangedAtPreset:5];
+        return;
+    }
+    if ([keyPath isEqualToString:@"filterPredicate6"]) {
+        [self visualRefreshIfFilterChangedAtPreset:6];
+        return;
+    }
+    if ([keyPath isEqualToString:@"filterPredicate7"]) {
+        [self visualRefreshIfFilterChangedAtPreset:7];
+        return;
+    }
+    if ([keyPath isEqualToString:@"filterPredicate8"]) {
+        [self visualRefreshIfFilterChangedAtPreset:8];
+        return;
+    }
+    if ([keyPath isEqualToString:@"filterPredicate9"]) {
+        [self visualRefreshIfFilterChangedAtPreset:9];
+        
+    }
+}
+
+- (void)visualRefreshIfFilterChangedAtPreset:(int)presentNumber {
+    if (self.activeFilterPredicateNumber == presentNumber) {
+        [self visualRefreshOnly:self];
     }
 }
 
diff --git a/TodoTxtMac/TTMFilters.xib b/TodoTxtMac/TTMFilters.xib
index 8504436..770d45e 100644
--- a/TodoTxtMac/TTMFilters.xib
+++ b/TodoTxtMac/TTMFilters.xib
@@ -8,11 +8,10 @@
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="TTMFiltersController">
             <connections>
-                <outlet property="appController" destination="btd-hr-xBM" id="Kwx-U8-bkO"/>
                 <outlet property="filter1PredicateEditor" destination="kyY-lA-F0K" id="b2T-Mm-XvS"/>
-                <outlet property="filter2PredicateEditor" destination="Ymr-Te-Jsu" id="GBd-RX-7pM"/>
-                <outlet property="filter3PredicateEditor" destination="6q7-hn-dBp" id="Nqb-rK-hpg"/>
-                <outlet property="filter4PredicateEditor" destination="dqt-SY-XL3" id="hYs-Ug-4YP"/>
+                <outlet property="filter2PredicateEditor" destination="2Y7-6o-WGp" id="stE-VQ-otX"/>
+                <outlet property="filter3PredicateEditor" destination="ugV-DT-onp" id="STw-kk-y5G"/>
+                <outlet property="filter4PredicateEditor" destination="I1X-wh-ckV" id="qky-2w-wpd"/>
                 <outlet property="filter5PredicateEditor" destination="Kic-py-fTP" id="Uxp-Qe-aCC"/>
                 <outlet property="filter6PredicateEditor" destination="Fft-UT-LWs" id="q0H-dg-8aZ"/>
                 <outlet property="filter7PredicateEditor" destination="abs-37-qFl" id="fj0-JR-Rfd"/>
@@ -51,11 +50,11 @@
                                                 <scrollView autohidesScrollers="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Kfn-x9-ZHF">
                                                     <rect key="frame" x="17" y="17" width="493" height="258"/>
                                                     <clipView key="contentView" id="4lo-Nv-gzt">
-                                                        <rect key="frame" x="1" y="1" width="491" height="256"/>
+                                                        <rect key="frame" x="1" y="1" width="476" height="256"/>
                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                         <subviews>
-                                                            <predicateEditor verticalHuggingPriority="750" nestingMode="compound" rowHeight="25" id="kyY-lA-F0K">
-                                                                <rect key="frame" x="0.0" y="0.0" width="491" height="325"/>
+                                                            <predicateEditor verticalHuggingPriority="750" nestingMode="compound" rowHeight="25" id="kyY-lA-F0K" userLabel="Filter 1 Predicate Editor">
+                                                                <rect key="frame" x="0.0" y="0.0" width="476" height="325"/>
                                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                                                                 <rowTemplates>
                                                                     <predicateEditorRowTemplate rowType="compound" id="jH5-WL-wUc">
@@ -533,7 +532,6 @@
                                                                     </predicateEditorRowTemplate>
                                                                 </rowTemplates>
                                                                 <connections>
-                                                                    <action selector="refreshTaskListFilters:" target="-2" id="XCy-xA-giF"/>
                                                                     <binding destination="VIO-0n-UUv" name="value" keyPath="values.filterPredicate1" id="nNL-eP-zci">
                                                                         <dictionary key="options">
                                                                             <string key="NSValueTransformerName">NSKeyedUnarchiveFromData</string>
@@ -563,43 +561,43 @@
                                         </view>
                                     </tabViewItem>
                                     <tabViewItem label="2" identifier="2" id="PCm-V3-9tb">
-                                        <view key="view" id="J97-zb-W9K">
+                                        <view key="view" horizontalHuggingPriority="252" id="J97-zb-W9K">
                                             <rect key="frame" x="10" y="33" width="527" height="278"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             <subviews>
-                                                <scrollView autohidesScrollers="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gV7-vJ-B61">
+                                                <scrollView autohidesScrollers="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="doj-4g-gdR">
                                                     <rect key="frame" x="17" y="17" width="493" height="258"/>
-                                                    <clipView key="contentView" id="6so-Zw-0Bg">
+                                                    <clipView key="contentView" id="U4v-fS-kHI">
                                                         <rect key="frame" x="1" y="1" width="476" height="256"/>
                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                         <subviews>
-                                                            <predicateEditor verticalHuggingPriority="750" nestingMode="compound" rowHeight="25" id="Ymr-Te-Jsu">
-                                                                <rect key="frame" x="0.0" y="0.0" width="491" height="325"/>
+                                                            <predicateEditor verticalHuggingPriority="750" nestingMode="compound" rowHeight="25" id="2Y7-6o-WGp" userLabel="Filter 2 Predicate Editor">
+                                                                <rect key="frame" x="0.0" y="0.0" width="476" height="325"/>
                                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                                                                 <rowTemplates>
-                                                                    <predicateEditorRowTemplate rowType="compound" id="4K2-dy-Irs">
+                                                                    <predicateEditorRowTemplate rowType="compound" id="1Fj-l7-gFJ">
                                                                         <popUpMenus>
-                                                                            <menu id="bzv-qs-auB">
+                                                                            <menu id="f4Y-5t-HJJ">
                                                                                 <items>
-                                                                                    <menuItem title="Any" state="on" id="sGg-1w-IZP">
+                                                                                    <menuItem title="Any" state="on" id="bgA-wq-As5">
                                                                                         <integer key="representedObject" value="2"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="All" id="V9F-OY-nZU">
+                                                                                    <menuItem title="All" id="6f3-xP-Poj">
                                                                                         <integer key="representedObject" value="1"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="None" id="t7h-Rs-b0m">
+                                                                                    <menuItem title="None" id="h1D-XT-I5z">
                                                                                         <integer key="representedObject" value="0"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="Yzb-SW-Nvi">
+                                                                            <menu id="sek-LT-Rtv">
                                                                                 <items>
-                                                                                    <menuItem title="of the following are true" state="on" id="Btm-pE-u3M"/>
+                                                                                    <menuItem title="of the following are true" state="on" id="y67-LA-ea7"/>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="jh0-gp-rOf">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="AD4-1T-WfV">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">rawText</string>
@@ -608,43 +606,43 @@
                                                                         <integer key="rightExpressionObject" value="700"/>
                                                                         <comparisonPredicateOptions key="options" caseInsensitive="YES" diacriticInsensitive="YES"/>
                                                                         <popUpMenus>
-                                                                            <menu id="nD7-Oq-ajR">
+                                                                            <menu id="hsK-eG-BdQ">
                                                                                 <items>
-                                                                                    <menuItem title="task" state="on" id="OPk-QE-d9s">
+                                                                                    <menuItem title="task" state="on" id="1nU-Kc-cag">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">rawText</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="qJv-YP-RCD">
+                                                                            <menu id="Rkn-wP-WFL">
                                                                                 <items>
-                                                                                    <menuItem title="contains" state="on" id="vmM-w9-7TN">
+                                                                                    <menuItem title="contains" state="on" id="uiW-aM-5pS">
                                                                                         <integer key="representedObject" value="99"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="begins with" id="jsf-hz-dJT">
+                                                                                    <menuItem title="begins with" id="ZLG-48-bnw">
                                                                                         <integer key="representedObject" value="8"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="ends with" id="VBo-oW-4mm">
+                                                                                    <menuItem title="ends with" id="3ox-sq-P7J">
                                                                                         <integer key="representedObject" value="9"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is" id="E2s-Gd-j1E">
+                                                                                    <menuItem title="is" id="Zvk-2Y-ne2">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="hX1-cw-15J">
+                                                                                    <menuItem title="is not" id="7Mk-Dp-t28">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="matches" id="mT7-2A-wni">
+                                                                                    <menuItem title="matches" id="Kez-Eg-FHk">
                                                                                         <integer key="representedObject" value="6"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is like" id="h3w-3t-mlV">
+                                                                                    <menuItem title="is like" id="G9G-co-mfN">
                                                                                         <integer key="representedObject" value="7"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="GEh-Ey-m0H">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="roO-IZ-Fa6">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">projects</string>
@@ -653,43 +651,43 @@
                                                                         <integer key="rightExpressionObject" value="700"/>
                                                                         <comparisonPredicateOptions key="options" caseInsensitive="YES" diacriticInsensitive="YES"/>
                                                                         <popUpMenus>
-                                                                            <menu id="Mgi-Rq-m0A">
+                                                                            <menu id="2Bz-QY-jaC">
                                                                                 <items>
-                                                                                    <menuItem title="projects" state="on" id="Vwe-Gx-pk4">
+                                                                                    <menuItem title="projects" state="on" id="ICZ-mU-QQQ">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">projects</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="7H1-mD-s3D">
+                                                                            <menu id="lOQ-RM-h02">
                                                                                 <items>
-                                                                                    <menuItem title="contains" state="on" id="y5a-OJ-JXg">
+                                                                                    <menuItem title="contains" state="on" id="dWz-5F-Idg">
                                                                                         <integer key="representedObject" value="99"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="begins with" id="kml-Ez-JZM">
+                                                                                    <menuItem title="begins with" id="cU7-kL-8Lp">
                                                                                         <integer key="representedObject" value="8"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="ends with" id="mME-a4-Kzd">
+                                                                                    <menuItem title="ends with" id="6To-SW-GDu">
                                                                                         <integer key="representedObject" value="9"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is" id="C5S-jV-QLN">
+                                                                                    <menuItem title="is" id="joL-SY-V8Q">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="CRc-vA-q3N">
+                                                                                    <menuItem title="is not" id="d6i-Ks-HRf">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="matches" id="jIX-V3-uD8">
+                                                                                    <menuItem title="matches" id="epy-Fd-OYr">
                                                                                         <integer key="representedObject" value="6"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is like" id="S4c-6Z-cZP">
+                                                                                    <menuItem title="is like" id="65Q-e4-1Df">
                                                                                         <integer key="representedObject" value="7"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="brq-tF-wDk">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="EdY-rQ-qpm">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">contexts</string>
@@ -698,43 +696,43 @@
                                                                         <integer key="rightExpressionObject" value="700"/>
                                                                         <comparisonPredicateOptions key="options" caseInsensitive="YES" diacriticInsensitive="YES"/>
                                                                         <popUpMenus>
-                                                                            <menu id="jwg-AI-Xpb">
+                                                                            <menu id="1mz-87-rAY">
                                                                                 <items>
-                                                                                    <menuItem title="contexts" state="on" id="MOK-Xc-aSS">
+                                                                                    <menuItem title="contexts" state="on" id="cNv-iR-Oqj">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">contexts</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="vIo-Oy-IJ7">
+                                                                            <menu id="vWj-Pi-hO6">
                                                                                 <items>
-                                                                                    <menuItem title="contains" state="on" id="1kh-fk-joL">
+                                                                                    <menuItem title="contains" state="on" id="bWk-Kl-t8G">
                                                                                         <integer key="representedObject" value="99"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="begins with" id="yGX-5n-00R">
+                                                                                    <menuItem title="begins with" id="FFS-Ka-zes">
                                                                                         <integer key="representedObject" value="8"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="ends with" id="prR-BR-M04">
+                                                                                    <menuItem title="ends with" id="95K-vP-7O2">
                                                                                         <integer key="representedObject" value="9"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is" id="LXb-7g-AjM">
+                                                                                    <menuItem title="is" id="bCW-54-2Xe">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="f3p-12-Cze">
+                                                                                    <menuItem title="is not" id="BMy-yu-ata">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="matches" id="B93-aZ-6CM">
+                                                                                    <menuItem title="matches" id="1qP-6M-3af">
                                                                                         <integer key="representedObject" value="6"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is like" id="4g2-Fk-cgE">
+                                                                                    <menuItem title="is like" id="wFL-BG-Azi">
                                                                                         <integer key="representedObject" value="7"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="3FA-GL-3vt">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="kXT-FF-Gea">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">priorityText</string>
@@ -743,40 +741,40 @@
                                                                         <integer key="rightExpressionObject" value="700"/>
                                                                         <comparisonPredicateOptions key="options" caseInsensitive="YES" diacriticInsensitive="YES"/>
                                                                         <popUpMenus>
-                                                                            <menu id="qvt-B1-LNO">
+                                                                            <menu id="dY4-12-Q9t">
                                                                                 <items>
-                                                                                    <menuItem title="priority" state="on" id="xNg-8a-MBA">
+                                                                                    <menuItem title="priority" state="on" id="7am-eR-LXW">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">priorityText</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="hHV-Zf-Vlr">
+                                                                            <menu id="MhI-P8-bLB">
                                                                                 <items>
-                                                                                    <menuItem title="is" state="on" id="sXa-BX-o1y">
+                                                                                    <menuItem title="is" state="on" id="AXk-v4-c3I">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="zYU-IU-QBd">
+                                                                                    <menuItem title="is not" id="oF7-Id-kCF">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than" id="JNy-Sd-tPc">
+                                                                                    <menuItem title="is less than" id="Srv-FH-mv6">
                                                                                         <integer key="representedObject" value="0"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than" id="dXr-1T-Kh7">
+                                                                                    <menuItem title="is greater than" id="beA-ln-9NX">
                                                                                         <integer key="representedObject" value="2"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than or equal to" id="zIg-FY-RLb">
+                                                                                    <menuItem title="is less than or equal to" id="Dbd-y7-Z0p">
                                                                                         <integer key="representedObject" value="1"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than or equal to" id="etP-xR-NMd">
+                                                                                    <menuItem title="is greater than or equal to" id="Dq3-b0-dNa">
                                                                                         <integer key="representedObject" value="3"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="gZk-zk-LcI" customClass="TTMPredicateEditorDateRowTemplate">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="UqC-QM-rfH" customClass="TTMPredicateEditorDateRowTemplate">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">dueDate</string>
@@ -784,40 +782,40 @@
                                                                         </array>
                                                                         <integer key="rightExpressionObject" value="900"/>
                                                                         <popUpMenus>
-                                                                            <menu id="kg4-o3-C9a">
+                                                                            <menu id="zve-E8-x3O">
                                                                                 <items>
-                                                                                    <menuItem title="due date" state="on" id="pMp-C8-omA">
+                                                                                    <menuItem title="due date" state="on" id="t18-VS-TTI">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">dueDate</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="SfB-qy-ALQ">
+                                                                            <menu id="MAb-ym-wsj">
                                                                                 <items>
-                                                                                    <menuItem title="is" state="on" id="er9-LB-e6z">
+                                                                                    <menuItem title="is" state="on" id="X03-OP-B4p">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="11B-94-zo4">
+                                                                                    <menuItem title="is not" id="Kbl-it-8rS">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than" id="SpG-yQ-LMs">
+                                                                                    <menuItem title="is less than" id="55W-4t-EFK">
                                                                                         <integer key="representedObject" value="0"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than" id="lse-gB-1pf">
+                                                                                    <menuItem title="is greater than" id="CXv-2p-drQ">
                                                                                         <integer key="representedObject" value="2"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than or equal to" id="qZq-N7-iEG">
+                                                                                    <menuItem title="is less than or equal to" id="U6A-yr-Ewd">
                                                                                         <integer key="representedObject" value="1"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than or equal to" id="UXI-RX-W1G">
+                                                                                    <menuItem title="is greater than or equal to" id="dzr-Gc-rFP">
                                                                                         <integer key="representedObject" value="3"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="LLX-C1-ybH" customClass="TTMPredicateEditorDateRowTemplate">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="OAx-aX-kff" customClass="TTMPredicateEditorDateRowTemplate">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">completionDate</string>
@@ -825,40 +823,40 @@
                                                                         </array>
                                                                         <integer key="rightExpressionObject" value="900"/>
                                                                         <popUpMenus>
-                                                                            <menu id="V8Q-2h-tgp">
+                                                                            <menu id="SNm-hn-3NN">
                                                                                 <items>
-                                                                                    <menuItem title="completion date" state="on" id="gok-x5-Aap">
+                                                                                    <menuItem title="completion date" state="on" id="jlK-zE-Vst">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">completionDate</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="Wzp-xh-RkM">
+                                                                            <menu id="1OA-aT-mow">
                                                                                 <items>
-                                                                                    <menuItem title="is" state="on" id="WwK-LJ-TER">
+                                                                                    <menuItem title="is" state="on" id="mlQ-jM-hZy">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="XdW-qP-3mm">
+                                                                                    <menuItem title="is not" id="skQ-4X-Tbs">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than" id="BI1-J0-d03">
+                                                                                    <menuItem title="is less than" id="7WH-n2-xQi">
                                                                                         <integer key="representedObject" value="0"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than" id="bFa-ht-tuw">
+                                                                                    <menuItem title="is greater than" id="4NL-uw-ZWL">
                                                                                         <integer key="representedObject" value="2"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than or equal to" id="9Ko-lL-8Hd">
+                                                                                    <menuItem title="is less than or equal to" id="aPJ-0Q-3Bx">
                                                                                         <integer key="representedObject" value="1"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than or equal to" id="VKP-Y0-drd">
+                                                                                    <menuItem title="is greater than or equal to" id="YUq-OT-XOC">
                                                                                         <integer key="representedObject" value="3"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="oAv-Cy-GNo" customClass="TTMPredicateEditorDateRowTemplate">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="7jQ-GN-po9" customClass="TTMPredicateEditorDateRowTemplate">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">creationDate</string>
@@ -866,40 +864,40 @@
                                                                         </array>
                                                                         <integer key="rightExpressionObject" value="900"/>
                                                                         <popUpMenus>
-                                                                            <menu id="AVy-db-tem">
+                                                                            <menu id="CMN-ED-mGp">
                                                                                 <items>
-                                                                                    <menuItem title="creation date" state="on" id="d9R-Za-E62">
+                                                                                    <menuItem title="creation date" state="on" id="6y9-Fp-ZNn">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">creationDate</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="c5o-1w-YP5">
+                                                                            <menu id="2Yc-MO-2UO">
                                                                                 <items>
-                                                                                    <menuItem title="is" state="on" id="vV9-gt-W3q">
+                                                                                    <menuItem title="is" state="on" id="B8T-HH-7na">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="KaM-6a-6Hf">
+                                                                                    <menuItem title="is not" id="SLw-DJ-pZ2">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than" id="k67-d7-9a4">
+                                                                                    <menuItem title="is less than" id="nU6-K3-kco">
                                                                                         <integer key="representedObject" value="0"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than" id="O8n-rk-Fcz">
+                                                                                    <menuItem title="is greater than" id="tpQ-Nb-1j8">
                                                                                         <integer key="representedObject" value="2"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than or equal to" id="mbd-us-pR2">
+                                                                                    <menuItem title="is less than or equal to" id="zAN-Ka-aMl">
                                                                                         <integer key="representedObject" value="1"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than or equal to" id="MGF-5M-OCd">
+                                                                                    <menuItem title="is greater than or equal to" id="zlT-Vv-c1h">
                                                                                         <integer key="representedObject" value="3"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="MGC-MY-nXu" customClass="TTMPredicateEditorDateRowTemplate">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="vpc-uv-s4d" customClass="TTMPredicateEditorDateRowTemplate">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">thresholdDate</string>
@@ -907,40 +905,40 @@
                                                                         </array>
                                                                         <integer key="rightExpressionObject" value="900"/>
                                                                         <popUpMenus>
-                                                                            <menu id="WAg-rY-zYb">
+                                                                            <menu id="7Yd-2C-4go">
                                                                                 <items>
-                                                                                    <menuItem title="threshold date" state="on" id="JPm-ul-RVg">
+                                                                                    <menuItem title="threshold date" state="on" id="YHQ-QA-va8">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">thresholdDate</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="keR-35-Vg0">
+                                                                            <menu id="8C2-LG-kqZ">
                                                                                 <items>
-                                                                                    <menuItem title="is" state="on" id="n7q-LM-EGP">
+                                                                                    <menuItem title="is" state="on" id="jOX-VH-86C">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="RCd-ns-dJo">
+                                                                                    <menuItem title="is not" id="4vx-Uo-TOA">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than" id="d2z-Dk-yh0">
+                                                                                    <menuItem title="is less than" id="ruG-Q9-hlL">
                                                                                         <integer key="representedObject" value="0"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than" id="G1B-7K-D4O">
+                                                                                    <menuItem title="is greater than" id="OWZ-GK-jt8">
                                                                                         <integer key="representedObject" value="2"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than or equal to" id="f1X-hW-Cxj">
+                                                                                    <menuItem title="is less than or equal to" id="rBf-uo-bLx">
                                                                                         <integer key="representedObject" value="1"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than or equal to" id="tFm-Vo-iHe">
+                                                                                    <menuItem title="is greater than or equal to" id="Y9J-B5-U7m">
                                                                                         <integer key="representedObject" value="3"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="efw-81-5H5" customClass="TTMPredicateEditorCompletedRowTemplate">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="ohC-hp-o1P" customClass="TTMPredicateEditorCompletedRowTemplate">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">completed</string>
@@ -948,25 +946,25 @@
                                                                         </array>
                                                                         <integer key="rightExpressionObject" value="300"/>
                                                                         <popUpMenus>
-                                                                            <menu id="VGe-ad-efA">
+                                                                            <menu id="Tn6-VQ-PjY">
                                                                                 <items>
-                                                                                    <menuItem title="completed" state="on" id="i4C-7U-4Sv">
+                                                                                    <menuItem title="completed" state="on" id="7gW-N1-77d">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">completed</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="kBG-JY-eBv">
+                                                                            <menu id="H2c-Jg-9iq">
                                                                                 <items>
-                                                                                    <menuItem title="is" state="on" id="fqM-ac-CAu">
+                                                                                    <menuItem title="is" state="on" id="x2y-ER-Icd">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="EFs-Qc-lYP" customClass="TTMPredicateEditorDueRowTemplate">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="l6J-Ey-Xw9" customClass="TTMPredicateEditorDueRowTemplate">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">dueState</string>
@@ -974,28 +972,28 @@
                                                                         </array>
                                                                         <integer key="rightExpressionObject" value="300"/>
                                                                         <popUpMenus>
-                                                                            <menu id="Vet-zY-dIl">
+                                                                            <menu id="2HI-ym-sZr">
                                                                                 <items>
-                                                                                    <menuItem title="dueState" state="on" id="k4e-3w-ZuR">
+                                                                                    <menuItem title="dueState" state="on" id="Vrk-GJ-VDO">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">dueState</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="QbA-K9-66L">
+                                                                            <menu id="A4q-mm-he3">
                                                                                 <items>
-                                                                                    <menuItem title="is" state="on" id="RXz-rl-Ps1">
+                                                                                    <menuItem title="is" state="on" id="Z0k-4d-6uo">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="pIX-81-cUi">
+                                                                                    <menuItem title="is not" id="Jbs-Ef-4fd">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="SJd-Dp-MaU" customClass="TTMPredicateEditorThresholdRowTemplate">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="eUZ-A5-VNK" customClass="TTMPredicateEditorThresholdRowTemplate">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">thresholdState</string>
@@ -1003,28 +1001,28 @@
                                                                         </array>
                                                                         <integer key="rightExpressionObject" value="300"/>
                                                                         <popUpMenus>
-                                                                            <menu id="yie-JD-HUc">
+                                                                            <menu id="MXr-qy-Jk7">
                                                                                 <items>
-                                                                                    <menuItem title="thresholdState" state="on" id="lZl-4V-plg">
+                                                                                    <menuItem title="thresholdState" state="on" id="N5a-U2-AAd">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">thresholdState</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="6SL-X0-sdj">
+                                                                            <menu id="ghJ-hD-VbU">
                                                                                 <items>
-                                                                                    <menuItem title="is" state="on" id="lyr-sT-w3q">
+                                                                                    <menuItem title="is" state="on" id="brh-cy-2GX">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="WJW-J6-vPT">
+                                                                                    <menuItem title="is not" id="keK-mn-dVm">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="Dla-Wu-Q0o" customClass="TTMPredicateEditorHiddenRowTemplate">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="7Ih-tA-cbt" customClass="TTMPredicateEditorHiddenRowTemplate">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">isHidden</string>
@@ -1032,18 +1030,18 @@
                                                                         </array>
                                                                         <integer key="rightExpressionObject" value="700"/>
                                                                         <popUpMenus>
-                                                                            <menu id="dFr-5v-Az2">
+                                                                            <menu id="Zef-uP-BEH">
                                                                                 <items>
-                                                                                    <menuItem title="isHidden" state="on" id="7iY-Z5-5yZ">
+                                                                                    <menuItem title="isHidden" state="on" id="0bX-gs-lwN">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">isHidden</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="ro1-Mc-1B1">
+                                                                            <menu id="S5o-wH-1du">
                                                                                 <items>
-                                                                                    <menuItem title="is" state="on" id="ZNT-dc-1bx">
+                                                                                    <menuItem title="is" state="on" id="hjm-Ie-RUw">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
                                                                                 </items>
@@ -1052,8 +1050,7 @@
                                                                     </predicateEditorRowTemplate>
                                                                 </rowTemplates>
                                                                 <connections>
-                                                                    <action selector="refreshTaskListFilters:" target="-2" id="uh5-Xj-2kQ"/>
-                                                                    <binding destination="VIO-0n-UUv" name="value" keyPath="values.filterPredicate2" id="xSl-H6-No6">
+                                                                    <binding destination="VIO-0n-UUv" name="value" keyPath="values.filterPredicate2" id="7cV-KY-guD">
                                                                         <dictionary key="options">
                                                                             <string key="NSValueTransformerName">NSKeyedUnarchiveFromData</string>
                                                                         </dictionary>
@@ -1063,21 +1060,21 @@
                                                         </subviews>
                                                         <color key="backgroundColor" white="0.91000002619999998" alpha="1" colorSpace="calibratedWhite"/>
                                                     </clipView>
-                                                    <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="1K4-id-L8P">
+                                                    <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="Zjj-pe-JqG">
                                                         <rect key="frame" x="-100" y="-100" width="360" height="15"/>
                                                         <autoresizingMask key="autoresizingMask"/>
                                                     </scroller>
-                                                    <scroller key="verticalScroller" verticalHuggingPriority="750" horizontal="NO" id="vAx-J9-pQC">
+                                                    <scroller key="verticalScroller" verticalHuggingPriority="750" horizontal="NO" id="cBR-nK-fn9">
                                                         <rect key="frame" x="477" y="1" width="15" height="256"/>
                                                         <autoresizingMask key="autoresizingMask"/>
                                                     </scroller>
                                                 </scrollView>
                                             </subviews>
                                             <constraints>
-                                                <constraint firstItem="gV7-vJ-B61" firstAttribute="top" secondItem="J97-zb-W9K" secondAttribute="top" constant="3" id="Bwq-JY-bOb"/>
-                                                <constraint firstAttribute="trailing" secondItem="gV7-vJ-B61" secondAttribute="trailing" constant="17" id="Wwu-Vn-hKy"/>
-                                                <constraint firstItem="gV7-vJ-B61" firstAttribute="leading" secondItem="J97-zb-W9K" secondAttribute="leading" constant="17" id="Yeh-Ps-HkB"/>
-                                                <constraint firstAttribute="bottom" secondItem="gV7-vJ-B61" secondAttribute="bottom" constant="17" id="epq-6E-Ntk"/>
+                                                <constraint firstAttribute="trailing" secondItem="doj-4g-gdR" secondAttribute="trailing" constant="17" id="9ie-Mq-SDo"/>
+                                                <constraint firstItem="doj-4g-gdR" firstAttribute="top" secondItem="J97-zb-W9K" secondAttribute="top" constant="3" id="bWl-wj-87v"/>
+                                                <constraint firstAttribute="bottom" secondItem="doj-4g-gdR" secondAttribute="bottom" constant="17" id="tzE-tK-3x0"/>
+                                                <constraint firstItem="doj-4g-gdR" firstAttribute="leading" secondItem="J97-zb-W9K" secondAttribute="leading" constant="17" id="vwx-1W-C0x"/>
                                             </constraints>
                                         </view>
                                     </tabViewItem>
@@ -1086,39 +1083,39 @@
                                             <rect key="frame" x="10" y="33" width="527" height="278"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             <subviews>
-                                                <scrollView autohidesScrollers="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Rl5-k4-2Qu">
+                                                <scrollView autohidesScrollers="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0ci-dt-YdL">
                                                     <rect key="frame" x="17" y="17" width="493" height="258"/>
-                                                    <clipView key="contentView" id="heN-Oz-PCI">
+                                                    <clipView key="contentView" id="VbW-fm-rK4">
                                                         <rect key="frame" x="1" y="1" width="476" height="256"/>
                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                         <subviews>
-                                                            <predicateEditor verticalHuggingPriority="750" nestingMode="compound" rowHeight="25" id="6q7-hn-dBp">
-                                                                <rect key="frame" x="0.0" y="0.0" width="491" height="325"/>
+                                                            <predicateEditor verticalHuggingPriority="750" nestingMode="compound" rowHeight="25" id="ugV-DT-onp" userLabel="Filter 3 Predicate Editor">
+                                                                <rect key="frame" x="0.0" y="0.0" width="476" height="325"/>
                                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                                                                 <rowTemplates>
-                                                                    <predicateEditorRowTemplate rowType="compound" id="xh2-WQ-Iok">
+                                                                    <predicateEditorRowTemplate rowType="compound" id="QiN-2C-CoG">
                                                                         <popUpMenus>
-                                                                            <menu id="lHz-GI-fdf">
+                                                                            <menu id="ZRn-RX-hZY">
                                                                                 <items>
-                                                                                    <menuItem title="Any" state="on" id="cgx-xv-Ecu">
+                                                                                    <menuItem title="Any" state="on" id="xa2-nf-L18">
                                                                                         <integer key="representedObject" value="2"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="All" id="McZ-xy-46T">
+                                                                                    <menuItem title="All" id="T3v-1Z-GqT">
                                                                                         <integer key="representedObject" value="1"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="None" id="dRS-ik-9Xv">
+                                                                                    <menuItem title="None" id="YEK-M2-gcu">
                                                                                         <integer key="representedObject" value="0"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="P0F-w8-i1C">
+                                                                            <menu id="LMr-pE-Tbb">
                                                                                 <items>
-                                                                                    <menuItem title="of the following are true" state="on" id="tei-Wk-H1F"/>
+                                                                                    <menuItem title="of the following are true" state="on" id="Uqq-4m-SdT"/>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="tP3-w9-zBf">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="dhi-rg-2nb">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">rawText</string>
@@ -1127,43 +1124,43 @@
                                                                         <integer key="rightExpressionObject" value="700"/>
                                                                         <comparisonPredicateOptions key="options" caseInsensitive="YES" diacriticInsensitive="YES"/>
                                                                         <popUpMenus>
-                                                                            <menu id="Cpf-FJ-w1d">
+                                                                            <menu id="a6C-Hy-OJz">
                                                                                 <items>
-                                                                                    <menuItem title="task" state="on" id="nHT-bS-dOf">
+                                                                                    <menuItem title="task" state="on" id="N3p-fQ-V1M">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">rawText</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="eAC-I7-f7F">
+                                                                            <menu id="H7I-2A-S3J">
                                                                                 <items>
-                                                                                    <menuItem title="contains" state="on" id="ggh-wc-IQC">
+                                                                                    <menuItem title="contains" state="on" id="O75-1f-kdL">
                                                                                         <integer key="representedObject" value="99"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="begins with" id="nsa-lA-PvH">
+                                                                                    <menuItem title="begins with" id="cYP-zh-NDX">
                                                                                         <integer key="representedObject" value="8"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="ends with" id="NHv-Fe-olH">
+                                                                                    <menuItem title="ends with" id="qMy-qP-gyp">
                                                                                         <integer key="representedObject" value="9"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is" id="N5z-zT-Gkv">
+                                                                                    <menuItem title="is" id="3Wy-7e-eQs">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="IRh-5t-4N5">
+                                                                                    <menuItem title="is not" id="5VT-07-9ag">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="matches" id="RVz-xT-Ayi">
+                                                                                    <menuItem title="matches" id="sj5-fV-aGi">
                                                                                         <integer key="representedObject" value="6"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is like" id="snh-nw-Tec">
+                                                                                    <menuItem title="is like" id="EmY-Oz-3eK">
                                                                                         <integer key="representedObject" value="7"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="lEo-Hm-WDE">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="nTl-3q-6TZ">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">projects</string>
@@ -1172,43 +1169,43 @@
                                                                         <integer key="rightExpressionObject" value="700"/>
                                                                         <comparisonPredicateOptions key="options" caseInsensitive="YES" diacriticInsensitive="YES"/>
                                                                         <popUpMenus>
-                                                                            <menu id="FEg-rl-Cmc">
+                                                                            <menu id="tO9-dc-NRd">
                                                                                 <items>
-                                                                                    <menuItem title="projects" state="on" id="oNm-71-kZ6">
+                                                                                    <menuItem title="projects" state="on" id="cfq-0D-g5R">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">projects</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="52T-Gl-27W">
+                                                                            <menu id="ii3-7g-bem">
                                                                                 <items>
-                                                                                    <menuItem title="contains" state="on" id="jLW-yd-fBg">
+                                                                                    <menuItem title="contains" state="on" id="Txn-1D-vFy">
                                                                                         <integer key="representedObject" value="99"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="begins with" id="bdy-PY-YoJ">
+                                                                                    <menuItem title="begins with" id="hSx-YJ-z7T">
                                                                                         <integer key="representedObject" value="8"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="ends with" id="6yA-3t-gLQ">
+                                                                                    <menuItem title="ends with" id="5Gw-qk-3oh">
                                                                                         <integer key="representedObject" value="9"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is" id="8CJ-L2-zmN">
+                                                                                    <menuItem title="is" id="ULy-Zv-OmL">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="qXL-tG-2cM">
+                                                                                    <menuItem title="is not" id="ZsI-ek-jfq">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="matches" id="Q7e-EP-9Bh">
+                                                                                    <menuItem title="matches" id="u26-dd-858">
                                                                                         <integer key="representedObject" value="6"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is like" id="jxV-Jw-ca4">
+                                                                                    <menuItem title="is like" id="IDG-yg-QVF">
                                                                                         <integer key="representedObject" value="7"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="pPy-Ze-i2B">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="BK9-lq-hLh">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">contexts</string>
@@ -1217,43 +1214,43 @@
                                                                         <integer key="rightExpressionObject" value="700"/>
                                                                         <comparisonPredicateOptions key="options" caseInsensitive="YES" diacriticInsensitive="YES"/>
                                                                         <popUpMenus>
-                                                                            <menu id="k0t-ak-Eul">
+                                                                            <menu id="BnL-4S-Blp">
                                                                                 <items>
-                                                                                    <menuItem title="contexts" state="on" id="iBM-a6-hgb">
+                                                                                    <menuItem title="contexts" state="on" id="RtG-hl-OXc">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">contexts</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="cG1-WW-S0q">
+                                                                            <menu id="bdk-P5-nY8">
                                                                                 <items>
-                                                                                    <menuItem title="contains" state="on" id="tyI-gN-HDW">
+                                                                                    <menuItem title="contains" state="on" id="Tk4-s4-FGK">
                                                                                         <integer key="representedObject" value="99"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="begins with" id="gFA-X9-QuU">
+                                                                                    <menuItem title="begins with" id="7wS-vW-Ifp">
                                                                                         <integer key="representedObject" value="8"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="ends with" id="9LL-ZC-ORS">
+                                                                                    <menuItem title="ends with" id="ME3-Ic-kzg">
                                                                                         <integer key="representedObject" value="9"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is" id="tWG-2v-Gez">
+                                                                                    <menuItem title="is" id="pFw-EV-q9T">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="Zdh-yd-msj">
+                                                                                    <menuItem title="is not" id="Kuu-fY-PnL">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="matches" id="Co6-aa-cFV">
+                                                                                    <menuItem title="matches" id="V6N-k0-AWv">
                                                                                         <integer key="representedObject" value="6"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is like" id="8O9-GH-pxX">
+                                                                                    <menuItem title="is like" id="2yL-e4-zvp">
                                                                                         <integer key="representedObject" value="7"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="7aP-Ye-x32">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="J3p-IS-Nj4">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">priorityText</string>
@@ -1262,40 +1259,40 @@
                                                                         <integer key="rightExpressionObject" value="700"/>
                                                                         <comparisonPredicateOptions key="options" caseInsensitive="YES" diacriticInsensitive="YES"/>
                                                                         <popUpMenus>
-                                                                            <menu id="VEB-WX-LTh">
+                                                                            <menu id="eao-17-nTO">
                                                                                 <items>
-                                                                                    <menuItem title="priority" state="on" id="s9C-Eo-Kog">
+                                                                                    <menuItem title="priority" state="on" id="s77-hI-9vu">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">priorityText</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="Vig-oO-YqQ">
+                                                                            <menu id="JYV-HK-Tig">
                                                                                 <items>
-                                                                                    <menuItem title="is" state="on" id="D3S-cT-1lh">
+                                                                                    <menuItem title="is" state="on" id="UGc-dM-y4D">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="9kJ-iy-G6Q">
+                                                                                    <menuItem title="is not" id="O74-Sy-KXx">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than" id="4Lk-G3-fwp">
+                                                                                    <menuItem title="is less than" id="w7m-xS-Mpt">
                                                                                         <integer key="representedObject" value="0"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than" id="ajP-tF-d5a">
+                                                                                    <menuItem title="is greater than" id="NXj-Wg-yhH">
                                                                                         <integer key="representedObject" value="2"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than or equal to" id="XOJ-IF-gLX">
+                                                                                    <menuItem title="is less than or equal to" id="lI5-Fr-hVN">
                                                                                         <integer key="representedObject" value="1"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than or equal to" id="3b2-ak-5DN">
+                                                                                    <menuItem title="is greater than or equal to" id="hHS-zG-UvS">
                                                                                         <integer key="representedObject" value="3"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="EWU-jt-2nn" customClass="TTMPredicateEditorDateRowTemplate">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="WQj-8y-OBe" customClass="TTMPredicateEditorDateRowTemplate">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">dueDate</string>
@@ -1303,40 +1300,40 @@
                                                                         </array>
                                                                         <integer key="rightExpressionObject" value="900"/>
                                                                         <popUpMenus>
-                                                                            <menu id="uJA-xl-sF8">
+                                                                            <menu id="eLG-AB-uay">
                                                                                 <items>
-                                                                                    <menuItem title="due date" state="on" id="ERu-FV-gtk">
+                                                                                    <menuItem title="due date" state="on" id="Mpc-ey-O4G">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">dueDate</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="ETc-Wc-rur">
+                                                                            <menu id="hiU-Op-SfI">
                                                                                 <items>
-                                                                                    <menuItem title="is" state="on" id="ZkW-yb-kWz">
+                                                                                    <menuItem title="is" state="on" id="k6f-Ma-RHj">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="1Ur-TP-7bo">
+                                                                                    <menuItem title="is not" id="N1w-P6-VcS">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than" id="f06-Sr-mbo">
+                                                                                    <menuItem title="is less than" id="3zM-GL-J1U">
                                                                                         <integer key="representedObject" value="0"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than" id="twp-6k-F59">
+                                                                                    <menuItem title="is greater than" id="oBP-RN-WKT">
                                                                                         <integer key="representedObject" value="2"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than or equal to" id="pja-sD-Ps7">
+                                                                                    <menuItem title="is less than or equal to" id="SvG-7q-433">
                                                                                         <integer key="representedObject" value="1"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than or equal to" id="E33-2D-tTt">
+                                                                                    <menuItem title="is greater than or equal to" id="akm-yL-O90">
                                                                                         <integer key="representedObject" value="3"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="JKY-Fz-PjG" customClass="TTMPredicateEditorDateRowTemplate">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="SnN-PK-bJK" customClass="TTMPredicateEditorDateRowTemplate">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">completionDate</string>
@@ -1344,40 +1341,40 @@
                                                                         </array>
                                                                         <integer key="rightExpressionObject" value="900"/>
                                                                         <popUpMenus>
-                                                                            <menu id="BdQ-T5-lXY">
+                                                                            <menu id="Kbq-oC-YFb">
                                                                                 <items>
-                                                                                    <menuItem title="completion date" state="on" id="n4P-5Q-zyg">
+                                                                                    <menuItem title="completion date" state="on" id="BSU-Db-dvv">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">completionDate</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="jZs-Hw-9Vu">
+                                                                            <menu id="kfF-UB-CnD">
                                                                                 <items>
-                                                                                    <menuItem title="is" state="on" id="r07-xp-iSz">
+                                                                                    <menuItem title="is" state="on" id="1H7-kQ-Jf8">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="PtO-mg-1wh">
+                                                                                    <menuItem title="is not" id="YWw-I5-TKt">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than" id="FMq-FR-HqX">
+                                                                                    <menuItem title="is less than" id="bAM-k0-E2V">
                                                                                         <integer key="representedObject" value="0"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than" id="cTf-zt-ev4">
+                                                                                    <menuItem title="is greater than" id="r67-Ee-4Sh">
                                                                                         <integer key="representedObject" value="2"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than or equal to" id="gAV-Yn-qQx">
+                                                                                    <menuItem title="is less than or equal to" id="9JP-DP-tHl">
                                                                                         <integer key="representedObject" value="1"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than or equal to" id="bm6-Kr-E7Y">
+                                                                                    <menuItem title="is greater than or equal to" id="15e-EL-1Zh">
                                                                                         <integer key="representedObject" value="3"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="0p8-Of-2AM" customClass="TTMPredicateEditorDateRowTemplate">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="kNV-II-C0T" customClass="TTMPredicateEditorDateRowTemplate">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">creationDate</string>
@@ -1385,40 +1382,40 @@
                                                                         </array>
                                                                         <integer key="rightExpressionObject" value="900"/>
                                                                         <popUpMenus>
-                                                                            <menu id="WfF-gS-xQs">
+                                                                            <menu id="OLq-rF-w8c">
                                                                                 <items>
-                                                                                    <menuItem title="creation date" state="on" id="gWE-lr-cxH">
+                                                                                    <menuItem title="creation date" state="on" id="fza-1Y-7Om">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">creationDate</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="qK0-C7-Qlg">
+                                                                            <menu id="V69-pm-8Cd">
                                                                                 <items>
-                                                                                    <menuItem title="is" state="on" id="K4Z-hb-xsp">
+                                                                                    <menuItem title="is" state="on" id="HGM-fV-EaO">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="vjV-4a-7d8">
+                                                                                    <menuItem title="is not" id="6eb-cH-gqZ">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than" id="Jlb-CK-YtK">
+                                                                                    <menuItem title="is less than" id="hOt-V9-hNu">
                                                                                         <integer key="representedObject" value="0"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than" id="JPo-Wo-MnH">
+                                                                                    <menuItem title="is greater than" id="TVr-L2-aF3">
                                                                                         <integer key="representedObject" value="2"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than or equal to" id="qZ1-Zj-izF">
+                                                                                    <menuItem title="is less than or equal to" id="dVN-vT-VTM">
                                                                                         <integer key="representedObject" value="1"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than or equal to" id="G5A-wt-xfu">
+                                                                                    <menuItem title="is greater than or equal to" id="hWX-no-4wa">
                                                                                         <integer key="representedObject" value="3"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="SqN-xb-Hyb" customClass="TTMPredicateEditorDateRowTemplate">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="lc1-7Q-N8F" customClass="TTMPredicateEditorDateRowTemplate">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">thresholdDate</string>
@@ -1426,40 +1423,40 @@
                                                                         </array>
                                                                         <integer key="rightExpressionObject" value="900"/>
                                                                         <popUpMenus>
-                                                                            <menu id="pfg-OW-2P4">
+                                                                            <menu id="Gfg-gv-ayX">
                                                                                 <items>
-                                                                                    <menuItem title="threshold date" state="on" id="J89-Kk-b4e">
+                                                                                    <menuItem title="threshold date" state="on" id="fzn-0p-t3w">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">thresholdDate</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="TQe-kg-mff">
+                                                                            <menu id="BP8-1F-OiQ">
                                                                                 <items>
-                                                                                    <menuItem title="is" state="on" id="TRU-cx-6kK">
+                                                                                    <menuItem title="is" state="on" id="70m-B6-NXM">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="kIg-we-aeS">
+                                                                                    <menuItem title="is not" id="ZpR-Yc-F7r">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than" id="7L9-kj-TkG">
+                                                                                    <menuItem title="is less than" id="AuG-HB-GR4">
                                                                                         <integer key="representedObject" value="0"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than" id="Agp-UP-hef">
+                                                                                    <menuItem title="is greater than" id="AD2-h6-x6L">
                                                                                         <integer key="representedObject" value="2"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than or equal to" id="962-xZ-vfp">
+                                                                                    <menuItem title="is less than or equal to" id="FUC-V7-Qan">
                                                                                         <integer key="representedObject" value="1"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than or equal to" id="Fdu-bH-iQr">
+                                                                                    <menuItem title="is greater than or equal to" id="QNw-Lg-V6O">
                                                                                         <integer key="representedObject" value="3"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="KyY-Lz-iiV" customClass="TTMPredicateEditorCompletedRowTemplate">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="Obd-30-Ih5" customClass="TTMPredicateEditorCompletedRowTemplate">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">completed</string>
@@ -1467,25 +1464,25 @@
                                                                         </array>
                                                                         <integer key="rightExpressionObject" value="300"/>
                                                                         <popUpMenus>
-                                                                            <menu id="s9q-xG-WO2">
+                                                                            <menu id="lFm-eQ-pbn">
                                                                                 <items>
-                                                                                    <menuItem title="completed" state="on" id="Srl-re-L7m">
+                                                                                    <menuItem title="completed" state="on" id="uvW-de-2QG">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">completed</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="HHu-oP-XhD">
+                                                                            <menu id="Lxl-ey-mDM">
                                                                                 <items>
-                                                                                    <menuItem title="is" state="on" id="CdX-I3-QTd">
+                                                                                    <menuItem title="is" state="on" id="Fbb-N3-vVo">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="c2D-fa-jyn" customClass="TTMPredicateEditorDueRowTemplate">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="Lnn-FC-IpP" customClass="TTMPredicateEditorDueRowTemplate">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">dueState</string>
@@ -1493,28 +1490,28 @@
                                                                         </array>
                                                                         <integer key="rightExpressionObject" value="300"/>
                                                                         <popUpMenus>
-                                                                            <menu id="P7R-5a-IYV">
+                                                                            <menu id="YCt-Vd-zSS">
                                                                                 <items>
-                                                                                    <menuItem title="dueState" state="on" id="46b-qr-VYX">
+                                                                                    <menuItem title="dueState" state="on" id="lcF-1m-8mw">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">dueState</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="AVc-iV-j3U">
+                                                                            <menu id="aoP-Rd-oCt">
                                                                                 <items>
-                                                                                    <menuItem title="is" state="on" id="TPS-3d-OCk">
+                                                                                    <menuItem title="is" state="on" id="EKX-jD-269">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="TCp-q9-dNm">
+                                                                                    <menuItem title="is not" id="ky1-pG-7Z3">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="wIe-dm-IwP" customClass="TTMPredicateEditorThresholdRowTemplate">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="OzU-0F-UdR" customClass="TTMPredicateEditorThresholdRowTemplate">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">thresholdState</string>
@@ -1522,28 +1519,28 @@
                                                                         </array>
                                                                         <integer key="rightExpressionObject" value="300"/>
                                                                         <popUpMenus>
-                                                                            <menu id="406-OE-sYT">
+                                                                            <menu id="suG-6t-HPz">
                                                                                 <items>
-                                                                                    <menuItem title="thresholdState" state="on" id="aQR-NE-sCF">
+                                                                                    <menuItem title="thresholdState" state="on" id="KOZ-mR-zaC">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">thresholdState</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="Qpl-xg-4x3">
+                                                                            <menu id="zFK-4W-pf3">
                                                                                 <items>
-                                                                                    <menuItem title="is" state="on" id="eoB-ff-dYX">
+                                                                                    <menuItem title="is" state="on" id="vKP-CU-kSV">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="FfL-D5-Ir4">
+                                                                                    <menuItem title="is not" id="jvP-vc-ums">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="0hq-Ac-ffe" customClass="TTMPredicateEditorHiddenRowTemplate">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="5xg-el-idC" customClass="TTMPredicateEditorHiddenRowTemplate">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">isHidden</string>
@@ -1551,18 +1548,18 @@
                                                                         </array>
                                                                         <integer key="rightExpressionObject" value="700"/>
                                                                         <popUpMenus>
-                                                                            <menu id="ZAH-M3-07U">
+                                                                            <menu id="vvD-kt-Gic">
                                                                                 <items>
-                                                                                    <menuItem title="isHidden" state="on" id="0Vj-Oj-jNN">
+                                                                                    <menuItem title="isHidden" state="on" id="l2v-1S-cpR">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">isHidden</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="yTj-of-EGN">
+                                                                            <menu id="yp8-ON-zsd">
                                                                                 <items>
-                                                                                    <menuItem title="is" state="on" id="Oaq-hX-rEr">
+                                                                                    <menuItem title="is" state="on" id="T46-hi-8lw">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
                                                                                 </items>
@@ -1571,8 +1568,7 @@
                                                                     </predicateEditorRowTemplate>
                                                                 </rowTemplates>
                                                                 <connections>
-                                                                    <action selector="refreshTaskListFilters:" target="-2" id="P5d-MF-WGV"/>
-                                                                    <binding destination="VIO-0n-UUv" name="value" keyPath="values.filterPredicate3" id="mxZ-7U-OEE">
+                                                                    <binding destination="VIO-0n-UUv" name="value" keyPath="values.filterPredicate3" id="vX8-Om-oYE">
                                                                         <dictionary key="options">
                                                                             <string key="NSValueTransformerName">NSKeyedUnarchiveFromData</string>
                                                                         </dictionary>
@@ -1582,21 +1578,21 @@
                                                         </subviews>
                                                         <color key="backgroundColor" white="0.91000002619999998" alpha="1" colorSpace="calibratedWhite"/>
                                                     </clipView>
-                                                    <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="OcV-t0-dKp">
+                                                    <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="XLI-Lg-49L">
                                                         <rect key="frame" x="-100" y="-100" width="360" height="15"/>
                                                         <autoresizingMask key="autoresizingMask"/>
                                                     </scroller>
-                                                    <scroller key="verticalScroller" verticalHuggingPriority="750" horizontal="NO" id="ues-cY-hv0">
+                                                    <scroller key="verticalScroller" verticalHuggingPriority="750" horizontal="NO" id="3Nt-k0-7U4">
                                                         <rect key="frame" x="477" y="1" width="15" height="256"/>
                                                         <autoresizingMask key="autoresizingMask"/>
                                                     </scroller>
                                                 </scrollView>
                                             </subviews>
                                             <constraints>
-                                                <constraint firstAttribute="trailing" secondItem="Rl5-k4-2Qu" secondAttribute="trailing" constant="17" id="51c-yG-dk6"/>
-                                                <constraint firstAttribute="bottom" secondItem="Rl5-k4-2Qu" secondAttribute="bottom" constant="17" id="YvV-Do-iEV"/>
-                                                <constraint firstItem="Rl5-k4-2Qu" firstAttribute="leading" secondItem="RwD-XB-Zgj" secondAttribute="leading" constant="17" id="Z8u-dQ-8Wz"/>
-                                                <constraint firstItem="Rl5-k4-2Qu" firstAttribute="top" secondItem="RwD-XB-Zgj" secondAttribute="top" constant="3" id="oM3-Jg-i7Q"/>
+                                                <constraint firstItem="0ci-dt-YdL" firstAttribute="top" secondItem="RwD-XB-Zgj" secondAttribute="top" constant="3" id="K2G-z6-tpx"/>
+                                                <constraint firstAttribute="bottom" secondItem="0ci-dt-YdL" secondAttribute="bottom" constant="17" id="Pgb-Vj-6nz"/>
+                                                <constraint firstAttribute="trailing" secondItem="0ci-dt-YdL" secondAttribute="trailing" constant="17" id="fiO-wV-rax"/>
+                                                <constraint firstItem="0ci-dt-YdL" firstAttribute="leading" secondItem="RwD-XB-Zgj" secondAttribute="leading" constant="17" id="qxt-qP-ObB"/>
                                             </constraints>
                                         </view>
                                     </tabViewItem>
@@ -1605,39 +1601,39 @@
                                             <rect key="frame" x="10" y="33" width="527" height="278"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             <subviews>
-                                                <scrollView autohidesScrollers="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ahb-tN-8y0">
+                                                <scrollView fixedFrame="YES" autohidesScrollers="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mVH-HR-oer">
                                                     <rect key="frame" x="17" y="17" width="493" height="258"/>
-                                                    <clipView key="contentView" id="OMr-xw-FM3">
+                                                    <clipView key="contentView" ambiguous="YES" id="7ML-FL-FLT">
                                                         <rect key="frame" x="1" y="1" width="476" height="256"/>
                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                         <subviews>
-                                                            <predicateEditor verticalHuggingPriority="750" nestingMode="compound" rowHeight="25" id="dqt-SY-XL3">
-                                                                <rect key="frame" x="0.0" y="0.0" width="491" height="325"/>
+                                                            <predicateEditor verticalHuggingPriority="750" ambiguous="YES" nestingMode="compound" rowHeight="25" id="I1X-wh-ckV" userLabel="Filter 4 Predicate Editor">
+                                                                <rect key="frame" x="0.0" y="0.0" width="476" height="325"/>
                                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                                                                 <rowTemplates>
-                                                                    <predicateEditorRowTemplate rowType="compound" id="RVr-y6-3Au">
+                                                                    <predicateEditorRowTemplate rowType="compound" id="crW-Un-59i">
                                                                         <popUpMenus>
-                                                                            <menu id="j7r-Af-ppb">
+                                                                            <menu id="U1M-t0-JYY">
                                                                                 <items>
-                                                                                    <menuItem title="Any" state="on" id="tHe-xJ-vxa">
+                                                                                    <menuItem title="Any" state="on" id="4Aw-hM-gfl">
                                                                                         <integer key="representedObject" value="2"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="All" id="05d-iO-e9O">
+                                                                                    <menuItem title="All" id="d44-64-ePd">
                                                                                         <integer key="representedObject" value="1"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="None" id="O8U-Cy-LI2">
+                                                                                    <menuItem title="None" id="RJU-oE-KeC">
                                                                                         <integer key="representedObject" value="0"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="LtA-MP-T6w">
+                                                                            <menu id="8E3-0K-boF">
                                                                                 <items>
-                                                                                    <menuItem title="of the following are true" state="on" id="OOL-dN-7Kh"/>
+                                                                                    <menuItem title="of the following are true" state="on" id="xDd-xK-bXj"/>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="lJb-bs-xTL">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="Ecp-9S-5ji">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">rawText</string>
@@ -1646,43 +1642,43 @@
                                                                         <integer key="rightExpressionObject" value="700"/>
                                                                         <comparisonPredicateOptions key="options" caseInsensitive="YES" diacriticInsensitive="YES"/>
                                                                         <popUpMenus>
-                                                                            <menu id="fyc-QA-A8U">
+                                                                            <menu id="sB5-ke-O80">
                                                                                 <items>
-                                                                                    <menuItem title="task" state="on" id="XbK-3S-dmI">
+                                                                                    <menuItem title="task" state="on" id="jlA-dE-QTb">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">rawText</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="wnF-MF-NoL">
+                                                                            <menu id="Flm-5z-XHv">
                                                                                 <items>
-                                                                                    <menuItem title="contains" state="on" id="otK-Ha-XOm">
+                                                                                    <menuItem title="contains" state="on" id="EcP-ls-mCB">
                                                                                         <integer key="representedObject" value="99"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="begins with" id="9lo-ea-HnF">
+                                                                                    <menuItem title="begins with" id="SZ9-O9-02B">
                                                                                         <integer key="representedObject" value="8"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="ends with" id="PSb-H8-Siw">
+                                                                                    <menuItem title="ends with" id="78G-lx-GOc">
                                                                                         <integer key="representedObject" value="9"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is" id="eUg-p5-G4j">
+                                                                                    <menuItem title="is" id="U2R-9M-8xN">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="p1j-9o-3sb">
+                                                                                    <menuItem title="is not" id="NuY-8V-GGk">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="matches" id="OL5-wi-6bk">
+                                                                                    <menuItem title="matches" id="6iV-Ka-V21">
                                                                                         <integer key="representedObject" value="6"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is like" id="w37-2u-eag">
+                                                                                    <menuItem title="is like" id="C8e-Xl-pk1">
                                                                                         <integer key="representedObject" value="7"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="Lod-UE-BSa">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="yXS-Rf-yCy">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">projects</string>
@@ -1691,43 +1687,43 @@
                                                                         <integer key="rightExpressionObject" value="700"/>
                                                                         <comparisonPredicateOptions key="options" caseInsensitive="YES" diacriticInsensitive="YES"/>
                                                                         <popUpMenus>
-                                                                            <menu id="rmq-GM-uP8">
+                                                                            <menu id="SyZ-cF-fu7">
                                                                                 <items>
-                                                                                    <menuItem title="projects" state="on" id="WMl-5c-eUc">
+                                                                                    <menuItem title="projects" state="on" id="y9A-jS-g0k">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">projects</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="jhE-bl-12i">
+                                                                            <menu id="8Ru-FV-I4A">
                                                                                 <items>
-                                                                                    <menuItem title="contains" state="on" id="kD3-pZ-vHc">
+                                                                                    <menuItem title="contains" state="on" id="WAX-9C-R2c">
                                                                                         <integer key="representedObject" value="99"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="begins with" id="TxP-HQ-Dyn">
+                                                                                    <menuItem title="begins with" id="o3O-na-w2e">
                                                                                         <integer key="representedObject" value="8"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="ends with" id="9Qb-3s-4Bk">
+                                                                                    <menuItem title="ends with" id="Vji-zb-GlB">
                                                                                         <integer key="representedObject" value="9"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is" id="BGc-ca-13Y">
+                                                                                    <menuItem title="is" id="pPj-bk-uTV">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="u0H-UB-CkD">
+                                                                                    <menuItem title="is not" id="DTI-HS-B69">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="matches" id="0Un-gZ-zlI">
+                                                                                    <menuItem title="matches" id="A40-4h-J0w">
                                                                                         <integer key="representedObject" value="6"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is like" id="Qnr-EO-eS7">
+                                                                                    <menuItem title="is like" id="mjW-4u-ecy">
                                                                                         <integer key="representedObject" value="7"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="iPM-mE-uvI">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="xyK-08-HCl">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">contexts</string>
@@ -1736,43 +1732,43 @@
                                                                         <integer key="rightExpressionObject" value="700"/>
                                                                         <comparisonPredicateOptions key="options" caseInsensitive="YES" diacriticInsensitive="YES"/>
                                                                         <popUpMenus>
-                                                                            <menu id="akE-bS-F3f">
+                                                                            <menu id="ICs-QG-anu">
                                                                                 <items>
-                                                                                    <menuItem title="contexts" state="on" id="igx-zp-oi1">
+                                                                                    <menuItem title="contexts" state="on" id="GCd-sG-cg9">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">contexts</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="8ze-eF-z0L">
+                                                                            <menu id="ydu-dq-7kK">
                                                                                 <items>
-                                                                                    <menuItem title="contains" state="on" id="uef-MJ-xIy">
+                                                                                    <menuItem title="contains" state="on" id="gIG-gd-ivt">
                                                                                         <integer key="representedObject" value="99"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="begins with" id="jo8-Hy-mLQ">
+                                                                                    <menuItem title="begins with" id="Fnd-Q7-2hx">
                                                                                         <integer key="representedObject" value="8"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="ends with" id="Zsm-1H-NmO">
+                                                                                    <menuItem title="ends with" id="UoL-In-FZs">
                                                                                         <integer key="representedObject" value="9"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is" id="9Gt-Eo-xa4">
+                                                                                    <menuItem title="is" id="ibf-XC-lYP">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="wPP-Hg-NBY">
+                                                                                    <menuItem title="is not" id="EcT-CL-wQp">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="matches" id="qQY-Lq-3Wn">
+                                                                                    <menuItem title="matches" id="E2S-u6-m6X">
                                                                                         <integer key="representedObject" value="6"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is like" id="R2u-JN-N32">
+                                                                                    <menuItem title="is like" id="DXb-Ik-IO7">
                                                                                         <integer key="representedObject" value="7"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="bvY-96-YMB">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="LBq-vL-WCL">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">priorityText</string>
@@ -1781,40 +1777,40 @@
                                                                         <integer key="rightExpressionObject" value="700"/>
                                                                         <comparisonPredicateOptions key="options" caseInsensitive="YES" diacriticInsensitive="YES"/>
                                                                         <popUpMenus>
-                                                                            <menu id="KgN-Z6-TSu">
+                                                                            <menu id="8BJ-dC-vA1">
                                                                                 <items>
-                                                                                    <menuItem title="priority" state="on" id="tSK-Rb-eFA">
+                                                                                    <menuItem title="priority" state="on" id="Y7S-2E-eub">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">priorityText</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="ZP6-Nt-1R1">
+                                                                            <menu id="5cb-C7-Pom">
                                                                                 <items>
-                                                                                    <menuItem title="is" state="on" id="xG8-8I-tae">
+                                                                                    <menuItem title="is" state="on" id="n9m-RF-ipP">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="2j7-Db-lK6">
+                                                                                    <menuItem title="is not" id="G7B-4s-vbv">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than" id="XeQ-Zl-xUY">
+                                                                                    <menuItem title="is less than" id="bUn-AL-35r">
                                                                                         <integer key="representedObject" value="0"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than" id="niZ-To-qsI">
+                                                                                    <menuItem title="is greater than" id="3Ie-q4-4fb">
                                                                                         <integer key="representedObject" value="2"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than or equal to" id="mzc-01-faw">
+                                                                                    <menuItem title="is less than or equal to" id="S0a-3O-5od">
                                                                                         <integer key="representedObject" value="1"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than or equal to" id="rei-5A-qYQ">
+                                                                                    <menuItem title="is greater than or equal to" id="OGO-5c-F77">
                                                                                         <integer key="representedObject" value="3"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="yMF-eB-zDg" customClass="TTMPredicateEditorDateRowTemplate">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="6yt-Jd-Zew" customClass="TTMPredicateEditorDateRowTemplate">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">dueDate</string>
@@ -1822,40 +1818,40 @@
                                                                         </array>
                                                                         <integer key="rightExpressionObject" value="900"/>
                                                                         <popUpMenus>
-                                                                            <menu id="4xg-86-U8x">
+                                                                            <menu id="Wse-DW-cht">
                                                                                 <items>
-                                                                                    <menuItem title="due date" state="on" id="rd9-G1-svO">
+                                                                                    <menuItem title="due date" state="on" id="HNV-ho-JFR">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">dueDate</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="cvp-C7-Oe9">
+                                                                            <menu id="Kih-AP-5PE">
                                                                                 <items>
-                                                                                    <menuItem title="is" state="on" id="CTx-d7-I7e">
+                                                                                    <menuItem title="is" state="on" id="0sR-R7-JTE">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="Ljz-5o-UVh">
+                                                                                    <menuItem title="is not" id="DEV-cM-7qi">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than" id="DZV-7z-COX">
+                                                                                    <menuItem title="is less than" id="FAj-DQ-jLp">
                                                                                         <integer key="representedObject" value="0"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than" id="IAd-ft-u3i">
+                                                                                    <menuItem title="is greater than" id="qN0-9R-tz9">
                                                                                         <integer key="representedObject" value="2"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than or equal to" id="Mtu-em-sjZ">
+                                                                                    <menuItem title="is less than or equal to" id="fwJ-vr-zPz">
                                                                                         <integer key="representedObject" value="1"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than or equal to" id="zwH-tZ-eJe">
+                                                                                    <menuItem title="is greater than or equal to" id="9O9-PN-9zP">
                                                                                         <integer key="representedObject" value="3"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="V3c-xy-qnT" customClass="TTMPredicateEditorDateRowTemplate">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="aeV-rP-ZMA" customClass="TTMPredicateEditorDateRowTemplate">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">completionDate</string>
@@ -1863,40 +1859,40 @@
                                                                         </array>
                                                                         <integer key="rightExpressionObject" value="900"/>
                                                                         <popUpMenus>
-                                                                            <menu id="QMf-TH-xSY">
+                                                                            <menu id="cB7-8j-1bt">
                                                                                 <items>
-                                                                                    <menuItem title="completion date" state="on" id="gg0-0M-gW8">
+                                                                                    <menuItem title="completion date" state="on" id="0bV-cC-q2Z">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">completionDate</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="9Pi-4o-TYF">
+                                                                            <menu id="5nb-1b-6cp">
                                                                                 <items>
-                                                                                    <menuItem title="is" state="on" id="HSF-Wj-HYT">
+                                                                                    <menuItem title="is" state="on" id="zPz-ds-XlB">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="I28-Vp-eeX">
+                                                                                    <menuItem title="is not" id="yXY-dz-r3V">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than" id="O1o-2x-Ey5">
+                                                                                    <menuItem title="is less than" id="G1e-N7-WiO">
                                                                                         <integer key="representedObject" value="0"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than" id="D7r-o0-MaK">
+                                                                                    <menuItem title="is greater than" id="wfj-qC-aT3">
                                                                                         <integer key="representedObject" value="2"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than or equal to" id="vf0-Cb-ugg">
+                                                                                    <menuItem title="is less than or equal to" id="6yE-Qv-khT">
                                                                                         <integer key="representedObject" value="1"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than or equal to" id="r4K-Cb-3Jc">
+                                                                                    <menuItem title="is greater than or equal to" id="iYX-2V-AbS">
                                                                                         <integer key="representedObject" value="3"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="kVc-Nn-6jl" customClass="TTMPredicateEditorDateRowTemplate">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="D41-JU-m66" customClass="TTMPredicateEditorDateRowTemplate">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">creationDate</string>
@@ -1904,40 +1900,40 @@
                                                                         </array>
                                                                         <integer key="rightExpressionObject" value="900"/>
                                                                         <popUpMenus>
-                                                                            <menu id="rf0-Jw-Bxt">
+                                                                            <menu id="fqJ-0v-6YY">
                                                                                 <items>
-                                                                                    <menuItem title="creation date" state="on" id="nop-2E-STd">
+                                                                                    <menuItem title="creation date" state="on" id="WGL-kF-cq1">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">creationDate</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="tci-Ko-ayN">
+                                                                            <menu id="z9P-H9-N37">
                                                                                 <items>
-                                                                                    <menuItem title="is" state="on" id="iER-JJ-GO0">
+                                                                                    <menuItem title="is" state="on" id="ISr-bU-y6F">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="EjS-rk-R5C">
+                                                                                    <menuItem title="is not" id="dAC-Hy-3hd">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than" id="Das-tN-1ow">
+                                                                                    <menuItem title="is less than" id="Gsr-Bi-VOP">
                                                                                         <integer key="representedObject" value="0"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than" id="9Ey-MF-oTX">
+                                                                                    <menuItem title="is greater than" id="edz-vN-SqC">
                                                                                         <integer key="representedObject" value="2"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than or equal to" id="wMG-cF-VpT">
+                                                                                    <menuItem title="is less than or equal to" id="X63-mY-l7O">
                                                                                         <integer key="representedObject" value="1"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than or equal to" id="7yZ-Al-4xX">
+                                                                                    <menuItem title="is greater than or equal to" id="LCV-So-nGU">
                                                                                         <integer key="representedObject" value="3"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="Fft-vK-fCL" customClass="TTMPredicateEditorDateRowTemplate">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="lP4-iH-NXp" customClass="TTMPredicateEditorDateRowTemplate">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">thresholdDate</string>
@@ -1945,40 +1941,40 @@
                                                                         </array>
                                                                         <integer key="rightExpressionObject" value="900"/>
                                                                         <popUpMenus>
-                                                                            <menu id="Inn-MU-71x">
+                                                                            <menu id="gCR-3l-vDX">
                                                                                 <items>
-                                                                                    <menuItem title="threshold date" state="on" id="aNb-7g-BrK">
+                                                                                    <menuItem title="threshold date" state="on" id="Jub-vt-s1h">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">thresholdDate</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="7mu-ik-fJb">
+                                                                            <menu id="Ddi-r5-wMn">
                                                                                 <items>
-                                                                                    <menuItem title="is" state="on" id="m2U-NV-2rw">
+                                                                                    <menuItem title="is" state="on" id="4H6-bg-e4c">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="1Uf-qT-joB">
+                                                                                    <menuItem title="is not" id="XSf-Og-ppp">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than" id="MKM-hS-dXN">
+                                                                                    <menuItem title="is less than" id="XW5-BB-z7T">
                                                                                         <integer key="representedObject" value="0"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than" id="Xrv-6M-ztg">
+                                                                                    <menuItem title="is greater than" id="jeU-24-Tnx">
                                                                                         <integer key="representedObject" value="2"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than or equal to" id="e1o-ba-hzU">
+                                                                                    <menuItem title="is less than or equal to" id="NKF-pr-Wry">
                                                                                         <integer key="representedObject" value="1"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than or equal to" id="0Sm-yV-no5">
+                                                                                    <menuItem title="is greater than or equal to" id="7eu-3i-iB6">
                                                                                         <integer key="representedObject" value="3"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="eh3-qD-tdj" customClass="TTMPredicateEditorCompletedRowTemplate">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="LZD-d5-2kX" customClass="TTMPredicateEditorCompletedRowTemplate">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">completed</string>
@@ -1986,25 +1982,25 @@
                                                                         </array>
                                                                         <integer key="rightExpressionObject" value="300"/>
                                                                         <popUpMenus>
-                                                                            <menu id="dMm-8C-qn0">
+                                                                            <menu id="RvL-mC-y6J">
                                                                                 <items>
-                                                                                    <menuItem title="completed" state="on" id="Uuw-ft-9GC">
+                                                                                    <menuItem title="completed" state="on" id="EFE-pT-fgo">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">completed</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="Ean-O1-Bx8">
+                                                                            <menu id="C5o-6a-IK4">
                                                                                 <items>
-                                                                                    <menuItem title="is" state="on" id="OwE-7E-919">
+                                                                                    <menuItem title="is" state="on" id="Jur-L5-IIK">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="rln-sU-3bG" customClass="TTMPredicateEditorDueRowTemplate">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="4CZ-IL-Rw9" customClass="TTMPredicateEditorDueRowTemplate">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">dueState</string>
@@ -2012,28 +2008,28 @@
                                                                         </array>
                                                                         <integer key="rightExpressionObject" value="300"/>
                                                                         <popUpMenus>
-                                                                            <menu id="NRi-af-zLx">
+                                                                            <menu id="Sla-wC-eE9">
                                                                                 <items>
-                                                                                    <menuItem title="dueState" state="on" id="nRg-6x-tvb">
+                                                                                    <menuItem title="dueState" state="on" id="pny-xL-UmM">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">dueState</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="lhV-aa-1PE">
+                                                                            <menu id="FDb-YQ-8ut">
                                                                                 <items>
-                                                                                    <menuItem title="is" state="on" id="YyH-AV-GXB">
+                                                                                    <menuItem title="is" state="on" id="wSG-zZ-B29">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="g74-2C-Ixs">
+                                                                                    <menuItem title="is not" id="cpe-pY-0Sq">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="yN6-lx-9o6" customClass="TTMPredicateEditorThresholdRowTemplate">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="KYg-7d-BnL" customClass="TTMPredicateEditorThresholdRowTemplate">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">thresholdState</string>
@@ -2041,28 +2037,28 @@
                                                                         </array>
                                                                         <integer key="rightExpressionObject" value="300"/>
                                                                         <popUpMenus>
-                                                                            <menu id="DeY-g1-CvZ">
+                                                                            <menu id="Vpg-pG-cg0">
                                                                                 <items>
-                                                                                    <menuItem title="thresholdState" state="on" id="uV4-OJ-xWL">
+                                                                                    <menuItem title="thresholdState" state="on" id="v9c-2q-CSU">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">thresholdState</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="szm-io-1L8">
+                                                                            <menu id="cIw-84-8CC">
                                                                                 <items>
-                                                                                    <menuItem title="is" state="on" id="atM-b9-M9g">
+                                                                                    <menuItem title="is" state="on" id="WG8-ku-30j">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="c3d-Mz-tRl">
+                                                                                    <menuItem title="is not" id="lcx-Zd-wMb">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="XWo-u4-5gV" customClass="TTMPredicateEditorHiddenRowTemplate">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="Pvv-Hq-eqQ" customClass="TTMPredicateEditorHiddenRowTemplate">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">isHidden</string>
@@ -2070,18 +2066,18 @@
                                                                         </array>
                                                                         <integer key="rightExpressionObject" value="700"/>
                                                                         <popUpMenus>
-                                                                            <menu id="NAK-7P-d6d">
+                                                                            <menu id="Acx-CU-3Oh">
                                                                                 <items>
-                                                                                    <menuItem title="isHidden" state="on" id="CF7-CT-4PO">
+                                                                                    <menuItem title="isHidden" state="on" id="K9h-WQ-Y2H">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">isHidden</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="Pdp-Jt-qv9">
+                                                                            <menu id="WvN-PR-YIL">
                                                                                 <items>
-                                                                                    <menuItem title="is" state="on" id="ZQ9-ET-TLy">
+                                                                                    <menuItem title="is" state="on" id="LZz-3a-a4K">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
                                                                                 </items>
@@ -2090,8 +2086,7 @@
                                                                     </predicateEditorRowTemplate>
                                                                 </rowTemplates>
                                                                 <connections>
-                                                                    <action selector="refreshTaskListFilters:" target="-2" id="Sib-1U-PvT"/>
-                                                                    <binding destination="VIO-0n-UUv" name="value" keyPath="values.filterPredicate4" id="dcI-bd-T3G">
+                                                                    <binding destination="VIO-0n-UUv" name="value" keyPath="values.filterPredicate4" id="ize-V9-n47">
                                                                         <dictionary key="options">
                                                                             <string key="NSValueTransformerName">NSKeyedUnarchiveFromData</string>
                                                                         </dictionary>
@@ -2101,22 +2096,16 @@
                                                         </subviews>
                                                         <color key="backgroundColor" white="0.91000002619999998" alpha="1" colorSpace="calibratedWhite"/>
                                                     </clipView>
-                                                    <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="7bF-Ax-i5p">
+                                                    <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="0Hy-uI-RW7">
                                                         <rect key="frame" x="-100" y="-100" width="360" height="15"/>
                                                         <autoresizingMask key="autoresizingMask"/>
                                                     </scroller>
-                                                    <scroller key="verticalScroller" verticalHuggingPriority="750" horizontal="NO" id="Dn2-oy-WkD">
+                                                    <scroller key="verticalScroller" verticalHuggingPriority="750" horizontal="NO" id="Nqo-vv-bnt">
                                                         <rect key="frame" x="477" y="1" width="15" height="256"/>
                                                         <autoresizingMask key="autoresizingMask"/>
                                                     </scroller>
                                                 </scrollView>
                                             </subviews>
-                                            <constraints>
-                                                <constraint firstAttribute="bottom" secondItem="Ahb-tN-8y0" secondAttribute="bottom" constant="17" id="5n7-KS-v7J"/>
-                                                <constraint firstItem="Ahb-tN-8y0" firstAttribute="leading" secondItem="oUE-Dl-Rpo" secondAttribute="leading" constant="17" id="9WH-My-20G"/>
-                                                <constraint firstItem="Ahb-tN-8y0" firstAttribute="top" secondItem="oUE-Dl-Rpo" secondAttribute="top" constant="3" id="Eag-ul-Gbi"/>
-                                                <constraint firstAttribute="trailing" secondItem="Ahb-tN-8y0" secondAttribute="trailing" constant="17" id="eX3-SO-zbw"/>
-                                            </constraints>
                                         </view>
                                     </tabViewItem>
                                     <tabViewItem label="5" identifier="5" id="Xfd-Gi-Kgs">
@@ -2609,7 +2598,6 @@
                                                                     </predicateEditorRowTemplate>
                                                                 </rowTemplates>
                                                                 <connections>
-                                                                    <action selector="refreshTaskListFilters:" target="-2" id="alE-yv-4uj"/>
                                                                     <binding destination="VIO-0n-UUv" name="value" keyPath="values.filterPredicate5" id="Q1e-in-vhO">
                                                                         <dictionary key="options">
                                                                             <string key="NSValueTransformerName">NSKeyedUnarchiveFromData</string>
@@ -3128,7 +3116,6 @@
                                                                     </predicateEditorRowTemplate>
                                                                 </rowTemplates>
                                                                 <connections>
-                                                                    <action selector="refreshTaskListFilters:" target="-2" id="aBu-8Y-Td6"/>
                                                                     <binding destination="VIO-0n-UUv" name="value" keyPath="values.filterPredicate6" id="Lk0-wU-BwF">
                                                                         <dictionary key="options">
                                                                             <string key="NSValueTransformerName">NSKeyedUnarchiveFromData</string>
@@ -3647,7 +3634,6 @@
                                                                     </predicateEditorRowTemplate>
                                                                 </rowTemplates>
                                                                 <connections>
-                                                                    <action selector="refreshTaskListFilters:" target="-2" id="8mZ-rZ-i7m"/>
                                                                     <binding destination="VIO-0n-UUv" name="value" keyPath="values.filterPredicate7" id="zOI-8I-1Pk">
                                                                         <dictionary key="options">
                                                                             <string key="NSValueTransformerName">NSKeyedUnarchiveFromData</string>
@@ -4166,7 +4152,6 @@
                                                                     </predicateEditorRowTemplate>
                                                                 </rowTemplates>
                                                                 <connections>
-                                                                    <action selector="refreshTaskListFilters:" target="-2" id="ACz-HP-9Rb"/>
                                                                     <binding destination="VIO-0n-UUv" name="value" keyPath="values.filterPredicate8" id="ydF-u1-heh">
                                                                         <dictionary key="options">
                                                                             <string key="NSValueTransformerName">NSKeyedUnarchiveFromData</string>
@@ -4685,7 +4670,6 @@
                                                                     </predicateEditorRowTemplate>
                                                                 </rowTemplates>
                                                                 <connections>
-                                                                    <action selector="refreshTaskListFilters:" target="-2" id="Qvy-55-CLZ"/>
                                                                     <binding destination="VIO-0n-UUv" name="value" keyPath="values.filterPredicate9" id="yYm-0Y-a5Q">
                                                                         <dictionary key="options">
                                                                             <string key="NSValueTransformerName">NSKeyedUnarchiveFromData</string>
@@ -4802,6 +4786,5 @@
             <point key="canvasLocation" x="232.5" y="376"/>
         </window>
         <userDefaultsController representsSharedInstance="YES" id="VIO-0n-UUv"/>
-        <customObject id="btd-hr-xBM" customClass="TTMAppController"/>
     </objects>
 </document>
diff --git a/TodoTxtMac/TTMFiltersController.h b/TodoTxtMac/TTMFiltersController.h
index 9a4f163..f40aca2 100644
--- a/TodoTxtMac/TTMFiltersController.h
+++ b/TodoTxtMac/TTMFiltersController.h
@@ -48,9 +48,8 @@
 
 @class TTMAppController;
 
-@interface TTMFiltersController : NSWindowController <NSWindowDelegate, NSTabViewDelegate>
+@interface TTMFiltersController : NSWindowController <NSWindowDelegate>
 
-@property (nonatomic, retain) IBOutlet TTMAppController *appController;
 @property (nonatomic, retain) IBOutlet NSTabView *tabView;
 
 @property (nonatomic, retain) IBOutlet NSPredicateEditor *filter1PredicateEditor;
@@ -69,11 +68,4 @@
  */
 - (IBAction)resetAllFilters:(id)sender;
 
-/*!
- * @method refreshTaskListFilters:
- * @abstract This method will cause a refresh of the filters for all open task lists.
- */
-- (IBAction)refreshTaskListFilters:(id)sender;
-
-
 @end
diff --git a/TodoTxtMac/TTMFiltersController.m b/TodoTxtMac/TTMFiltersController.m
index 0d4c0cf..e05ff6c 100644
--- a/TodoTxtMac/TTMFiltersController.m
+++ b/TodoTxtMac/TTMFiltersController.m
@@ -46,7 +46,6 @@
 
 #import "TTMFiltersController.h"
 #import "TTMFilterPredicates.h"
-#import "TTMAppController.h"
 
 @implementation TTMFiltersController
 
@@ -71,35 +70,25 @@ - (IBAction)resetAllFilters:(id)sender {
             // the one with focus at the time this method is executed
             // will not be cleared. This is only really necessary to
             // call on the predicate editor with focus.
-            [self.filter1PredicateEditor reloadCriteria];
-            [self.filter2PredicateEditor reloadCriteria];
-            [self.filter3PredicateEditor reloadCriteria];
-            [self.filter4PredicateEditor reloadCriteria];
-            [self.filter5PredicateEditor reloadCriteria];
-            [self.filter6PredicateEditor reloadCriteria];
-            [self.filter7PredicateEditor reloadCriteria];
-            [self.filter8PredicateEditor reloadCriteria];
-            [self.filter9PredicateEditor reloadCriteria];
+            [self reloadAllPredicateEditors];
         }
     }];
 }
 
-- (IBAction)refreshTaskListFilters:(id)sender {
-    [self.appController visualRefreshAll:self];
+- (void)reloadAllPredicateEditors {
+    [self.filter1PredicateEditor reloadCriteria];
+    [self.filter2PredicateEditor reloadCriteria];
+    [self.filter3PredicateEditor reloadCriteria];
+    [self.filter4PredicateEditor reloadCriteria];
+    [self.filter5PredicateEditor reloadCriteria];
+    [self.filter6PredicateEditor reloadCriteria];
+    [self.filter7PredicateEditor reloadCriteria];
+    [self.filter8PredicateEditor reloadCriteria];
+    [self.filter9PredicateEditor reloadCriteria];
 }
 
 #pragma mark - Window Delegate Methods
 
-- (BOOL)windowShouldClose:(NSWindow *)window {
-    // We do this to catch the case where the user enters a value into one of the text fields but
-    // closes the window without hitting enter or tab.
-    return [window makeFirstResponder:nil];
-}
-
-- (void)windowWillClose:(NSNotification *)notification {
-    [self refreshTaskListFilters:self];
-}
-
 - (void)keyDown:(NSEvent *)theEvent {
     NSUInteger flags = [theEvent modifierFlags];
     NSString *passedChar = [theEvent charactersIgnoringModifiers];
@@ -121,10 +110,14 @@ - (void)keyDown:(NSEvent *)theEvent {
     [super keyDown:theEvent];
 }
 
-#pragma mark - NSTabViewDelegate Delegate Methods
+- (void)windowDidResignKey:(NSNotification *)notification {
+    [self forceFilterPredicateEditsToBeApplied];
+}
 
-- (void)tabView:(NSTabView *)tabView didSelectTabViewItem:(NSTabViewItem *)tabViewItem {
-    [self refreshTaskListFilters:self];
+- (void)forceFilterPredicateEditsToBeApplied {
+    if ([self.window.firstResponder isKindOfClass:[NSTextView class]]) {
+        [self.window.firstResponder insertNewline:self];
+    }
 }
 
 @end

From 70b379e79b485921ddfe9b9f425e54626e31e7cb Mon Sep 17 00:00:00 2001
From: Michael Descy <mjdescy@gmail.com>
Date: Wed, 10 Aug 2016 13:20:55 -0400
Subject: [PATCH 06/11] Closes Issue #166: Window size and position not saved.

---
 TodoTxtMac/Base.lproj/TTMDocument.xib | 6 +++---
 TodoTxtMac/TTMFilters.xib             | 4 ++--
 TodoTxtMac/TTMPreferences.xib         | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/TodoTxtMac/Base.lproj/TTMDocument.xib b/TodoTxtMac/Base.lproj/TTMDocument.xib
index cc5a1c0..7e24949 100644
--- a/TodoTxtMac/Base.lproj/TTMDocument.xib
+++ b/TodoTxtMac/Base.lproj/TTMDocument.xib
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="15G31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
         <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
@@ -20,12 +20,12 @@
             </connections>
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="5" userLabel="Window">
+        <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" frameAutosaveName="TTMDocument" animationBehavior="default" id="5" userLabel="Window">
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES" unifiedTitleAndToolbar="YES"/>
             <windowCollectionBehavior key="collectionBehavior" fullScreenPrimary="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="133" y="235" width="510" height="447"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1440" height="877"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/>
             <value key="minSize" type="size" width="94" height="86"/>
             <view key="contentView" wantsLayer="YES" id="6">
                 <rect key="frame" x="0.0" y="0.0" width="510" height="447"/>
diff --git a/TodoTxtMac/TTMFilters.xib b/TodoTxtMac/TTMFilters.xib
index 770d45e..ff9c5f3 100644
--- a/TodoTxtMac/TTMFilters.xib
+++ b/TodoTxtMac/TTMFilters.xib
@@ -23,7 +23,7 @@
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <window title="Define Filter Presets" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="QvC-M9-y7g">
+        <window title="Define Filter Presets" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" frameAutosaveName="TTMFilters" animationBehavior="default" id="QvC-M9-y7g">
             <windowStyleMask key="styleMask" titled="YES" closable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="196" y="240" width="573" height="386"/>
@@ -2101,7 +2101,7 @@
                                                         <autoresizingMask key="autoresizingMask"/>
                                                     </scroller>
                                                     <scroller key="verticalScroller" verticalHuggingPriority="750" horizontal="NO" id="Nqo-vv-bnt">
-                                                        <rect key="frame" x="477" y="1" width="15" height="256"/>
+                                                        <rect key="frame" x="1" y="1" width="15" height="0.0"/>
                                                         <autoresizingMask key="autoresizingMask"/>
                                                     </scroller>
                                                 </scrollView>
diff --git a/TodoTxtMac/TTMPreferences.xib b/TodoTxtMac/TTMPreferences.xib
index fa953d7..3e53089 100644
--- a/TodoTxtMac/TTMPreferences.xib
+++ b/TodoTxtMac/TTMPreferences.xib
@@ -17,7 +17,7 @@
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <window title="TodoTxtMac Preferences" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="QvC-M9-y7g">
+        <window title="Preferences" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" frameAutosaveName="TTMPreferences" animationBehavior="default" id="QvC-M9-y7g">
             <windowStyleMask key="styleMask" titled="YES" closable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="196" y="240" width="630" height="468"/>

From 7ad7a83f5776cb99b167d6606e721428df556551 Mon Sep 17 00:00:00 2001
From: Michael Descy <mjdescy@gmail.com>
Date: Wed, 10 Aug 2016 20:29:27 -0400
Subject: [PATCH 07/11] Closes Issue #117: Filter: add "does not contain" for
 task.

---
 TodoTxtMac.xcodeproj/project.pbxproj          |    6 +
 TodoTxtMac/TTMFilters.xib                     | 1306 +++++++++--------
 .../TTMPredicateEditorTextRowTemplate.h       |   51 +
 .../TTMPredicateEditorTextRowTemplate.m       |   90 ++
 4 files changed, 803 insertions(+), 650 deletions(-)
 create mode 100644 TodoTxtMac/TTMPredicateEditorTextRowTemplate.h
 create mode 100644 TodoTxtMac/TTMPredicateEditorTextRowTemplate.m

diff --git a/TodoTxtMac.xcodeproj/project.pbxproj b/TodoTxtMac.xcodeproj/project.pbxproj
index 5bd8ba5..4a6efa0 100644
--- a/TodoTxtMac.xcodeproj/project.pbxproj
+++ b/TodoTxtMac.xcodeproj/project.pbxproj
@@ -70,6 +70,7 @@
 		00D102B61991ABBE00D30237 /* TTMTasklistMetadata.m in Sources */ = {isa = PBXBuildFile; fileRef = 00D102B51991ABBE00D30237 /* TTMTasklistMetadata.m */; };
 		00D531271CACA285007EF487 /* TTMTask_IsHidden_UnitTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00D531261CACA285007EF487 /* TTMTask_IsHidden_UnitTests.m */; };
 		00D5312A1CACC3C7007EF487 /* TTMPredicateEditorHiddenRowTemplate.m in Sources */ = {isa = PBXBuildFile; fileRef = 00D531291CACC3C7007EF487 /* TTMPredicateEditorHiddenRowTemplate.m */; };
+		00DA4A1D1D5BBEB600CFF2B1 /* TTMPredicateEditorTextRowTemplate.m in Sources */ = {isa = PBXBuildFile; fileRef = 00DA4A1C1D5BBEB600CFF2B1 /* TTMPredicateEditorTextRowTemplate.m */; };
 		00EAAB9718E0C168009CBE8C /* TTMPredicateEditorDateRowTemplate.m in Sources */ = {isa = PBXBuildFile; fileRef = 00EAAB9618E0C168009CBE8C /* TTMPredicateEditorDateRowTemplate.m */; };
 		00EAAB9A18E1CF79009CBE8C /* TTMPredicateEditorDueRowTemplate.m in Sources */ = {isa = PBXBuildFile; fileRef = 00EAAB9918E1CF79009CBE8C /* TTMPredicateEditorDueRowTemplate.m */; };
 		00EAAB9D18E1CF92009CBE8C /* TTMPredicateEditorCompletedRowTemplate.m in Sources */ = {isa = PBXBuildFile; fileRef = 00EAAB9C18E1CF92009CBE8C /* TTMPredicateEditorCompletedRowTemplate.m */; };
@@ -191,6 +192,8 @@
 		00D531261CACA285007EF487 /* TTMTask_IsHidden_UnitTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TTMTask_IsHidden_UnitTests.m; sourceTree = "<group>"; };
 		00D531281CACC3C7007EF487 /* TTMPredicateEditorHiddenRowTemplate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TTMPredicateEditorHiddenRowTemplate.h; sourceTree = "<group>"; };
 		00D531291CACC3C7007EF487 /* TTMPredicateEditorHiddenRowTemplate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TTMPredicateEditorHiddenRowTemplate.m; sourceTree = "<group>"; };
+		00DA4A1B1D5BBEB600CFF2B1 /* TTMPredicateEditorTextRowTemplate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TTMPredicateEditorTextRowTemplate.h; sourceTree = "<group>"; };
+		00DA4A1C1D5BBEB600CFF2B1 /* TTMPredicateEditorTextRowTemplate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TTMPredicateEditorTextRowTemplate.m; sourceTree = "<group>"; };
 		00EAAB9518E0C168009CBE8C /* TTMPredicateEditorDateRowTemplate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TTMPredicateEditorDateRowTemplate.h; sourceTree = "<group>"; };
 		00EAAB9618E0C168009CBE8C /* TTMPredicateEditorDateRowTemplate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TTMPredicateEditorDateRowTemplate.m; sourceTree = "<group>"; };
 		00EAAB9818E1CF79009CBE8C /* TTMPredicateEditorDueRowTemplate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TTMPredicateEditorDueRowTemplate.h; sourceTree = "<group>"; };
@@ -261,6 +264,8 @@
 				007B835E1A5A415300A4D5F7 /* TTMPredicateEditorThresholdRowTemplate.m */,
 				00D531281CACC3C7007EF487 /* TTMPredicateEditorHiddenRowTemplate.h */,
 				00D531291CACC3C7007EF487 /* TTMPredicateEditorHiddenRowTemplate.m */,
+				00DA4A1B1D5BBEB600CFF2B1 /* TTMPredicateEditorTextRowTemplate.h */,
+				00DA4A1C1D5BBEB600CFF2B1 /* TTMPredicateEditorTextRowTemplate.m */,
 			);
 			name = Filters;
 			sourceTree = "<group>";
@@ -586,6 +591,7 @@
 				00930EB118B537C10064D41B /* TTMDateUtility.m in Sources */,
 				00FA1D2818F1EF340066A437 /* FontNameTransformer.m in Sources */,
 				00D102B61991ABBE00D30237 /* TTMTasklistMetadata.m in Sources */,
+				00DA4A1D1D5BBEB600CFF2B1 /* TTMPredicateEditorTextRowTemplate.m in Sources */,
 				0086C98518B54F1A00A427AA /* TTMTableViewDelegate.m in Sources */,
 				007B835F1A5A415300A4D5F7 /* TTMPredicateEditorThresholdRowTemplate.m in Sources */,
 				00B4CBAF18B43E8400313DAA /* TTMDocument.m in Sources */,
diff --git a/TodoTxtMac/TTMFilters.xib b/TodoTxtMac/TTMFilters.xib
index ff9c5f3..2420f1a 100644
--- a/TodoTxtMac/TTMFilters.xib
+++ b/TodoTxtMac/TTMFilters.xib
@@ -12,11 +12,11 @@
                 <outlet property="filter2PredicateEditor" destination="2Y7-6o-WGp" id="stE-VQ-otX"/>
                 <outlet property="filter3PredicateEditor" destination="ugV-DT-onp" id="STw-kk-y5G"/>
                 <outlet property="filter4PredicateEditor" destination="I1X-wh-ckV" id="qky-2w-wpd"/>
-                <outlet property="filter5PredicateEditor" destination="Kic-py-fTP" id="Uxp-Qe-aCC"/>
-                <outlet property="filter6PredicateEditor" destination="Fft-UT-LWs" id="q0H-dg-8aZ"/>
-                <outlet property="filter7PredicateEditor" destination="abs-37-qFl" id="fj0-JR-Rfd"/>
-                <outlet property="filter8PredicateEditor" destination="m5a-mt-V4E" id="gPm-Qt-bVw"/>
-                <outlet property="filter9PredicateEditor" destination="XsA-Sd-hjN" id="jJf-J4-emJ"/>
+                <outlet property="filter5PredicateEditor" destination="AY8-4B-1xS" id="MLU-aj-Oio"/>
+                <outlet property="filter6PredicateEditor" destination="WLK-Np-fUg" id="UDX-V5-BQP"/>
+                <outlet property="filter7PredicateEditor" destination="z57-jf-7VI" id="kr5-Ax-lP3"/>
+                <outlet property="filter8PredicateEditor" destination="6aD-Lp-Zdw" id="QyV-m5-Uiu"/>
+                <outlet property="filter9PredicateEditor" destination="NNi-kU-L08" id="1af-zS-plH"/>
                 <outlet property="tabView" destination="qgL-I9-GFI" id="l0a-Rd-nwu"/>
                 <outlet property="window" destination="QvC-M9-y7g" id="2Wz-Uh-Jdi"/>
             </connections>
@@ -79,7 +79,7 @@
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="aKG-US-XPw">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="aKG-US-XPw" customClass="TTMPredicateEditorTextRowTemplate">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">rawText</string>
@@ -102,6 +102,9 @@
                                                                                     <menuItem title="contains" state="on" id="cLM-gl-cXU">
                                                                                         <integer key="representedObject" value="99"/>
                                                                                     </menuItem>
+                                                                                    <menuItem title="does not contain" id="raW-tD-wQD" userLabel="does not contain">
+                                                                                        <integer key="representedObject" value="10"/>
+                                                                                    </menuItem>
                                                                                     <menuItem title="begins with" id="r1l-Bt-fHd">
                                                                                         <integer key="representedObject" value="8"/>
                                                                                     </menuItem>
@@ -210,6 +213,9 @@
                                                                                     <menuItem title="is like" id="Lc9-Y0-xVc">
                                                                                         <integer key="representedObject" value="7"/>
                                                                                     </menuItem>
+                                                                                    <menuItem title="in" id="hEq-il-x2p">
+                                                                                        <integer key="representedObject" value="10"/>
+                                                                                    </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
@@ -597,7 +603,7 @@
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="AD4-1T-WfV">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="AD4-1T-WfV" customClass="TTMPredicateEditorTextRowTemplate">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">rawText</string>
@@ -620,6 +626,9 @@
                                                                                     <menuItem title="contains" state="on" id="uiW-aM-5pS">
                                                                                         <integer key="representedObject" value="99"/>
                                                                                     </menuItem>
+                                                                                    <menuItem title="does not contain" id="WQ6-mk-bHk" userLabel="does not contain">
+                                                                                        <integer key="representedObject" value="10"/>
+                                                                                    </menuItem>
                                                                                     <menuItem title="begins with" id="ZLG-48-bnw">
                                                                                         <integer key="representedObject" value="8"/>
                                                                                     </menuItem>
@@ -1115,7 +1124,7 @@
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="dhi-rg-2nb">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="dhi-rg-2nb" customClass="TTMPredicateEditorTextRowTemplate">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">rawText</string>
@@ -1138,6 +1147,9 @@
                                                                                     <menuItem title="contains" state="on" id="O75-1f-kdL">
                                                                                         <integer key="representedObject" value="99"/>
                                                                                     </menuItem>
+                                                                                    <menuItem title="does not contain" id="A7R-F4-itY" userLabel="does not contain">
+                                                                                        <integer key="representedObject" value="10"/>
+                                                                                    </menuItem>
                                                                                     <menuItem title="begins with" id="cYP-zh-NDX">
                                                                                         <integer key="representedObject" value="8"/>
                                                                                     </menuItem>
@@ -1633,7 +1645,7 @@
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="Ecp-9S-5ji">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="Ecp-9S-5ji" customClass="TTMPredicateEditorTextRowTemplate">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">rawText</string>
@@ -1656,6 +1668,9 @@
                                                                                     <menuItem title="contains" state="on" id="EcP-ls-mCB">
                                                                                         <integer key="representedObject" value="99"/>
                                                                                     </menuItem>
+                                                                                    <menuItem title="does not contain" id="9jQ-AG-fBt" userLabel="does not contain">
+                                                                                        <integer key="representedObject" value="10"/>
+                                                                                    </menuItem>
                                                                                     <menuItem title="begins with" id="SZ9-O9-02B">
                                                                                         <integer key="representedObject" value="8"/>
                                                                                     </menuItem>
@@ -2101,7 +2116,7 @@
                                                         <autoresizingMask key="autoresizingMask"/>
                                                     </scroller>
                                                     <scroller key="verticalScroller" verticalHuggingPriority="750" horizontal="NO" id="Nqo-vv-bnt">
-                                                        <rect key="frame" x="1" y="1" width="15" height="0.0"/>
+                                                        <rect key="frame" x="477" y="1" width="15" height="256"/>
                                                         <autoresizingMask key="autoresizingMask"/>
                                                     </scroller>
                                                 </scrollView>
@@ -2110,42 +2125,42 @@
                                     </tabViewItem>
                                     <tabViewItem label="5" identifier="5" id="Xfd-Gi-Kgs">
                                         <view key="view" id="lUo-BT-eGj">
-                                            <rect key="frame" x="10" y="33" width="527" height="280"/>
+                                            <rect key="frame" x="10" y="33" width="527" height="278"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             <subviews>
-                                                <scrollView autohidesScrollers="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="myt-XN-4g3">
-                                                    <rect key="frame" x="17" y="17" width="493" height="260"/>
-                                                    <clipView key="contentView" id="Tt4-YI-Ls6">
-                                                        <rect key="frame" x="1" y="1" width="491" height="258"/>
+                                                <scrollView autohidesScrollers="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3Cn-q6-oN3">
+                                                    <rect key="frame" x="17" y="17" width="493" height="258"/>
+                                                    <clipView key="contentView" id="V2Y-OM-9jg">
+                                                        <rect key="frame" x="1" y="1" width="476" height="256"/>
                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                         <subviews>
-                                                            <predicateEditor verticalHuggingPriority="750" nestingMode="compound" rowHeight="25" id="Kic-py-fTP">
-                                                                <rect key="frame" x="0.0" y="0.0" width="491" height="325"/>
+                                                            <predicateEditor verticalHuggingPriority="750" nestingMode="compound" rowHeight="25" id="AY8-4B-1xS" userLabel="Filter 5 Predicate Editor">
+                                                                <rect key="frame" x="0.0" y="0.0" width="476" height="325"/>
                                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                                                                 <rowTemplates>
-                                                                    <predicateEditorRowTemplate rowType="compound" id="dFn-PY-Alr">
+                                                                    <predicateEditorRowTemplate rowType="compound" id="B3J-sJ-NKr">
                                                                         <popUpMenus>
-                                                                            <menu id="SRY-8p-dqr">
+                                                                            <menu id="MwS-lA-l2e">
                                                                                 <items>
-                                                                                    <menuItem title="Any" state="on" id="Ubv-n3-tVe">
+                                                                                    <menuItem title="Any" state="on" id="ktv-bC-zMU">
                                                                                         <integer key="representedObject" value="2"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="All" id="GIR-FF-e7U">
+                                                                                    <menuItem title="All" id="r3S-Wm-LtO">
                                                                                         <integer key="representedObject" value="1"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="None" id="Bgv-hY-jGA">
+                                                                                    <menuItem title="None" id="KKu-gL-pmv">
                                                                                         <integer key="representedObject" value="0"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="mBV-6f-gOk">
+                                                                            <menu id="NKG-Lr-DWA">
                                                                                 <items>
-                                                                                    <menuItem title="of the following are true" state="on" id="NtI-h9-VTh"/>
+                                                                                    <menuItem title="of the following are true" state="on" id="xRO-F8-p8b"/>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="tZn-tn-fmc">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="HWI-wp-5a1" customClass="TTMPredicateEditorTextRowTemplate">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">rawText</string>
@@ -2154,43 +2169,46 @@
                                                                         <integer key="rightExpressionObject" value="700"/>
                                                                         <comparisonPredicateOptions key="options" caseInsensitive="YES" diacriticInsensitive="YES"/>
                                                                         <popUpMenus>
-                                                                            <menu id="y5d-3V-G1o">
+                                                                            <menu id="q7x-n7-xN8">
                                                                                 <items>
-                                                                                    <menuItem title="task" state="on" id="awS-j8-cNP">
+                                                                                    <menuItem title="task" state="on" id="3J9-kQ-UwN">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">rawText</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="XMO-Aa-dlr">
+                                                                            <menu id="ruF-LT-xFL">
                                                                                 <items>
-                                                                                    <menuItem title="contains" state="on" id="cOw-20-edK">
+                                                                                    <menuItem title="contains" state="on" id="cX1-Yi-8dn">
                                                                                         <integer key="representedObject" value="99"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="begins with" id="cxN-2i-Kn1">
+                                                                                    <menuItem title="does not contain" id="HM3-EI-xow" userLabel="does not contain">
+                                                                                        <integer key="representedObject" value="10"/>
+                                                                                    </menuItem>
+                                                                                    <menuItem title="begins with" id="yOv-Vo-sd9">
                                                                                         <integer key="representedObject" value="8"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="ends with" id="uy1-4Q-gLv">
+                                                                                    <menuItem title="ends with" id="5C7-2c-79S">
                                                                                         <integer key="representedObject" value="9"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is" id="rhA-Xy-BbU">
+                                                                                    <menuItem title="is" id="y29-b6-Dub">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="ZMK-0E-kMH">
+                                                                                    <menuItem title="is not" id="yV6-ds-hpk">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="matches" id="GPv-fM-yI1">
+                                                                                    <menuItem title="matches" id="aoN-oA-tcn">
                                                                                         <integer key="representedObject" value="6"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is like" id="yhb-5p-jQu">
+                                                                                    <menuItem title="is like" id="t7S-Uk-py3">
                                                                                         <integer key="representedObject" value="7"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="JJT-Pa-V11">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="ts7-2L-FsO">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">projects</string>
@@ -2199,43 +2217,43 @@
                                                                         <integer key="rightExpressionObject" value="700"/>
                                                                         <comparisonPredicateOptions key="options" caseInsensitive="YES" diacriticInsensitive="YES"/>
                                                                         <popUpMenus>
-                                                                            <menu id="MoI-G1-wmC">
+                                                                            <menu id="SUI-BS-Dxe">
                                                                                 <items>
-                                                                                    <menuItem title="projects" state="on" id="qYL-Fe-cSW">
+                                                                                    <menuItem title="projects" state="on" id="f1K-p1-fKY">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">projects</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="jfq-Lz-MJV">
+                                                                            <menu id="9DV-RX-XbY">
                                                                                 <items>
-                                                                                    <menuItem title="contains" state="on" id="Pdj-e8-d1q">
+                                                                                    <menuItem title="contains" state="on" id="thl-nO-pER">
                                                                                         <integer key="representedObject" value="99"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="begins with" id="pya-pf-tNI">
+                                                                                    <menuItem title="begins with" id="xEz-uu-hug">
                                                                                         <integer key="representedObject" value="8"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="ends with" id="bpv-hi-N5e">
+                                                                                    <menuItem title="ends with" id="cwF-FE-kd1">
                                                                                         <integer key="representedObject" value="9"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is" id="JPN-UT-EZc">
+                                                                                    <menuItem title="is" id="Q6h-oY-21d">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="YVI-Dx-I8o">
+                                                                                    <menuItem title="is not" id="wFr-ZU-u0R">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="matches" id="bVN-jm-DSV">
+                                                                                    <menuItem title="matches" id="txB-6V-rkJ">
                                                                                         <integer key="representedObject" value="6"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is like" id="dxX-kb-j4n">
+                                                                                    <menuItem title="is like" id="Icp-Sd-6zY">
                                                                                         <integer key="representedObject" value="7"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="qi1-dh-Ef7">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="fOp-fl-ii6">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">contexts</string>
@@ -2244,43 +2262,43 @@
                                                                         <integer key="rightExpressionObject" value="700"/>
                                                                         <comparisonPredicateOptions key="options" caseInsensitive="YES" diacriticInsensitive="YES"/>
                                                                         <popUpMenus>
-                                                                            <menu id="vBY-5A-rfG">
+                                                                            <menu id="cfF-SL-Rw5">
                                                                                 <items>
-                                                                                    <menuItem title="contexts" state="on" id="Rlr-NW-M1l">
+                                                                                    <menuItem title="contexts" state="on" id="11d-w7-A9Y">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">contexts</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="vNv-Wm-MnU">
+                                                                            <menu id="Vaa-KU-JO0">
                                                                                 <items>
-                                                                                    <menuItem title="contains" state="on" id="zgC-LS-LRG">
+                                                                                    <menuItem title="contains" state="on" id="xqV-pa-DPu">
                                                                                         <integer key="representedObject" value="99"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="begins with" id="uYh-q2-mPq">
+                                                                                    <menuItem title="begins with" id="jL9-4B-v7d">
                                                                                         <integer key="representedObject" value="8"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="ends with" id="x22-ex-eEt">
+                                                                                    <menuItem title="ends with" id="lvY-jt-oAf">
                                                                                         <integer key="representedObject" value="9"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is" id="22R-JG-r7u">
+                                                                                    <menuItem title="is" id="5UF-U1-4ZK">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="4FE-tN-r0l">
+                                                                                    <menuItem title="is not" id="6j9-mS-qHe">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="matches" id="XlK-d0-S1x">
+                                                                                    <menuItem title="matches" id="BAo-uk-HxI">
                                                                                         <integer key="representedObject" value="6"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is like" id="HYv-Pg-R8Z">
+                                                                                    <menuItem title="is like" id="xAT-A5-hbd">
                                                                                         <integer key="representedObject" value="7"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="KiX-gA-xFL">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="dqr-8I-1MD">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">priorityText</string>
@@ -2289,40 +2307,40 @@
                                                                         <integer key="rightExpressionObject" value="700"/>
                                                                         <comparisonPredicateOptions key="options" caseInsensitive="YES" diacriticInsensitive="YES"/>
                                                                         <popUpMenus>
-                                                                            <menu id="tCH-jO-xbA">
+                                                                            <menu id="jvQ-Mt-C9w">
                                                                                 <items>
-                                                                                    <menuItem title="priority" state="on" id="Afo-DA-z4L">
+                                                                                    <menuItem title="priority" state="on" id="ZIT-3a-KAV">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">priorityText</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="HPO-BZ-Kft">
+                                                                            <menu id="KYD-As-GgL">
                                                                                 <items>
-                                                                                    <menuItem title="is" state="on" id="VFf-iv-DuW">
+                                                                                    <menuItem title="is" state="on" id="PYn-dd-Kt2">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="lCd-TW-5p5">
+                                                                                    <menuItem title="is not" id="fYT-03-1L6">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than" id="Wip-46-kkT">
+                                                                                    <menuItem title="is less than" id="q3V-Rf-4Tz">
                                                                                         <integer key="representedObject" value="0"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than" id="9f4-By-rRR">
+                                                                                    <menuItem title="is greater than" id="oVH-gn-cxb">
                                                                                         <integer key="representedObject" value="2"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than or equal to" id="4u2-SG-11U">
+                                                                                    <menuItem title="is less than or equal to" id="axY-EL-cc3">
                                                                                         <integer key="representedObject" value="1"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than or equal to" id="YFi-gU-xIG">
+                                                                                    <menuItem title="is greater than or equal to" id="SNd-8X-nY6">
                                                                                         <integer key="representedObject" value="3"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="exb-FO-dvF" customClass="TTMPredicateEditorDateRowTemplate">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="LAD-2W-z69" customClass="TTMPredicateEditorDateRowTemplate">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">dueDate</string>
@@ -2330,40 +2348,40 @@
                                                                         </array>
                                                                         <integer key="rightExpressionObject" value="900"/>
                                                                         <popUpMenus>
-                                                                            <menu id="f0w-8g-MQd">
+                                                                            <menu id="hYC-L1-VKU">
                                                                                 <items>
-                                                                                    <menuItem title="due date" state="on" id="IgO-4I-dDC">
+                                                                                    <menuItem title="due date" state="on" id="tMd-Sq-4xN">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">dueDate</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="BIs-gJ-WY2">
+                                                                            <menu id="VKX-2o-0g3">
                                                                                 <items>
-                                                                                    <menuItem title="is" state="on" id="kc3-zK-7je">
+                                                                                    <menuItem title="is" state="on" id="dDy-t9-knR">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="GPE-b5-Fp3">
+                                                                                    <menuItem title="is not" id="1Lk-pT-baY">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than" id="Bf8-PD-EaW">
+                                                                                    <menuItem title="is less than" id="K6l-2y-H0V">
                                                                                         <integer key="representedObject" value="0"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than" id="qfz-dS-V7u">
+                                                                                    <menuItem title="is greater than" id="7Lj-4b-qkr">
                                                                                         <integer key="representedObject" value="2"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than or equal to" id="4QK-A5-ZNJ">
+                                                                                    <menuItem title="is less than or equal to" id="96w-1N-XJ6">
                                                                                         <integer key="representedObject" value="1"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than or equal to" id="Hup-x4-Urf">
+                                                                                    <menuItem title="is greater than or equal to" id="Ffl-4P-sAC">
                                                                                         <integer key="representedObject" value="3"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="mEJ-Md-Z3R" customClass="TTMPredicateEditorDateRowTemplate">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="6MF-Yy-12B" customClass="TTMPredicateEditorDateRowTemplate">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">completionDate</string>
@@ -2371,40 +2389,40 @@
                                                                         </array>
                                                                         <integer key="rightExpressionObject" value="900"/>
                                                                         <popUpMenus>
-                                                                            <menu id="2hW-7T-wJA">
+                                                                            <menu id="ESJ-0C-UV2">
                                                                                 <items>
-                                                                                    <menuItem title="completion date" state="on" id="4pk-cr-NiL">
+                                                                                    <menuItem title="completion date" state="on" id="UGa-bY-nH6">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">completionDate</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="nyA-e0-gGn">
+                                                                            <menu id="bWZ-FV-Eft">
                                                                                 <items>
-                                                                                    <menuItem title="is" state="on" id="nel-aA-6FO">
+                                                                                    <menuItem title="is" state="on" id="Hpb-t3-eX2">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="zbR-5y-lbL">
+                                                                                    <menuItem title="is not" id="UeN-F4-QkP">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than" id="NPm-Hh-g1i">
+                                                                                    <menuItem title="is less than" id="beT-M5-e7c">
                                                                                         <integer key="representedObject" value="0"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than" id="cKB-3B-YBc">
+                                                                                    <menuItem title="is greater than" id="IVG-ji-y4H">
                                                                                         <integer key="representedObject" value="2"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than or equal to" id="Lcj-hu-RGH">
+                                                                                    <menuItem title="is less than or equal to" id="igW-r5-QkR">
                                                                                         <integer key="representedObject" value="1"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than or equal to" id="DBF-t3-k59">
+                                                                                    <menuItem title="is greater than or equal to" id="mCh-gz-pxr">
                                                                                         <integer key="representedObject" value="3"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="sLe-Et-Sfp" customClass="TTMPredicateEditorDateRowTemplate">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="wyZ-6o-2I2" customClass="TTMPredicateEditorDateRowTemplate">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">creationDate</string>
@@ -2412,40 +2430,40 @@
                                                                         </array>
                                                                         <integer key="rightExpressionObject" value="900"/>
                                                                         <popUpMenus>
-                                                                            <menu id="SGM-29-kmj">
+                                                                            <menu id="WyW-fa-KVu">
                                                                                 <items>
-                                                                                    <menuItem title="creation date" state="on" id="s1u-hs-dmk">
+                                                                                    <menuItem title="creation date" state="on" id="5mI-Hh-Xso">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">creationDate</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="aJc-Gr-7J4">
+                                                                            <menu id="wTl-q4-xS7">
                                                                                 <items>
-                                                                                    <menuItem title="is" state="on" id="vR2-Px-XUo">
+                                                                                    <menuItem title="is" state="on" id="Dig-5z-lgV">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="FMU-vl-tIh">
+                                                                                    <menuItem title="is not" id="cjj-Nu-XPi">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than" id="Zkp-p3-fvv">
+                                                                                    <menuItem title="is less than" id="f5f-tr-CXF">
                                                                                         <integer key="representedObject" value="0"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than" id="pCj-PV-L4C">
+                                                                                    <menuItem title="is greater than" id="BJO-kl-U0S">
                                                                                         <integer key="representedObject" value="2"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than or equal to" id="WUj-aC-u2h">
+                                                                                    <menuItem title="is less than or equal to" id="HT8-wV-fka">
                                                                                         <integer key="representedObject" value="1"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than or equal to" id="itb-39-OEn">
+                                                                                    <menuItem title="is greater than or equal to" id="Npk-7R-jeV">
                                                                                         <integer key="representedObject" value="3"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="Iz4-TE-VSg" customClass="TTMPredicateEditorDateRowTemplate">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="G8o-Bp-dCr" customClass="TTMPredicateEditorDateRowTemplate">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">thresholdDate</string>
@@ -2453,40 +2471,40 @@
                                                                         </array>
                                                                         <integer key="rightExpressionObject" value="900"/>
                                                                         <popUpMenus>
-                                                                            <menu id="c1g-D8-KHa">
+                                                                            <menu id="47b-3q-ted">
                                                                                 <items>
-                                                                                    <menuItem title="threshold date" state="on" id="48Q-7T-dLn">
+                                                                                    <menuItem title="threshold date" state="on" id="3QI-kY-vVn">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">thresholdDate</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="A3g-FZ-QpW">
+                                                                            <menu id="lBE-SQ-oZ9">
                                                                                 <items>
-                                                                                    <menuItem title="is" state="on" id="DTa-Bn-pg1">
+                                                                                    <menuItem title="is" state="on" id="tmQ-tV-feb">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="3pP-B4-MMQ">
+                                                                                    <menuItem title="is not" id="Sqs-Ob-utY">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than" id="MCQ-A1-5te">
+                                                                                    <menuItem title="is less than" id="6PB-o8-331">
                                                                                         <integer key="representedObject" value="0"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than" id="mwV-Ar-f8C">
+                                                                                    <menuItem title="is greater than" id="ehd-LH-UUk">
                                                                                         <integer key="representedObject" value="2"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than or equal to" id="21j-Bv-IVE">
+                                                                                    <menuItem title="is less than or equal to" id="n1c-cV-ry8">
                                                                                         <integer key="representedObject" value="1"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than or equal to" id="TK0-g3-Bhh">
+                                                                                    <menuItem title="is greater than or equal to" id="TvA-7k-qxF">
                                                                                         <integer key="representedObject" value="3"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="Arf-rL-mQ4" customClass="TTMPredicateEditorCompletedRowTemplate">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="7h0-E7-HYv" customClass="TTMPredicateEditorCompletedRowTemplate">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">completed</string>
@@ -2494,25 +2512,25 @@
                                                                         </array>
                                                                         <integer key="rightExpressionObject" value="300"/>
                                                                         <popUpMenus>
-                                                                            <menu id="dbF-Pz-1PN">
+                                                                            <menu id="3nw-Xc-784">
                                                                                 <items>
-                                                                                    <menuItem title="completed" state="on" id="Sra-h4-pO5">
+                                                                                    <menuItem title="completed" state="on" id="rv8-4W-829">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">completed</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="BGA-G6-hMQ">
+                                                                            <menu id="QUe-Tx-x1Z">
                                                                                 <items>
-                                                                                    <menuItem title="is" state="on" id="SXO-82-j8C">
+                                                                                    <menuItem title="is" state="on" id="o5g-53-GSn">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="WmG-I0-89V" customClass="TTMPredicateEditorDueRowTemplate">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="BlY-38-vOf" customClass="TTMPredicateEditorDueRowTemplate">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">dueState</string>
@@ -2520,28 +2538,28 @@
                                                                         </array>
                                                                         <integer key="rightExpressionObject" value="300"/>
                                                                         <popUpMenus>
-                                                                            <menu id="Bjf-0B-xX3">
+                                                                            <menu id="cDv-on-Ry6">
                                                                                 <items>
-                                                                                    <menuItem title="dueState" state="on" id="gGl-ac-izg">
+                                                                                    <menuItem title="dueState" state="on" id="68B-k4-B8G">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">dueState</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="05T-oV-lQb">
+                                                                            <menu id="aNe-u4-Vz3">
                                                                                 <items>
-                                                                                    <menuItem title="is" state="on" id="gBr-7J-oeM">
+                                                                                    <menuItem title="is" state="on" id="50c-ng-KM1">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="LAr-7o-fGM">
+                                                                                    <menuItem title="is not" id="G68-iL-heb">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="wbd-QY-5aI" customClass="TTMPredicateEditorThresholdRowTemplate">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="Uqv-Rd-0uM" customClass="TTMPredicateEditorThresholdRowTemplate">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">thresholdState</string>
@@ -2549,28 +2567,28 @@
                                                                         </array>
                                                                         <integer key="rightExpressionObject" value="300"/>
                                                                         <popUpMenus>
-                                                                            <menu id="eVm-hU-Ov5">
+                                                                            <menu id="Eu9-SO-1Nf">
                                                                                 <items>
-                                                                                    <menuItem title="thresholdState" state="on" id="bfG-Nc-6iV">
+                                                                                    <menuItem title="thresholdState" state="on" id="NqJ-EB-FAf">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">thresholdState</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="PGQ-f4-8La">
+                                                                            <menu id="3w0-Kc-DOi">
                                                                                 <items>
-                                                                                    <menuItem title="is" state="on" id="JHT-ZH-Hof">
+                                                                                    <menuItem title="is" state="on" id="zNK-mV-r3d">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="iGD-uw-66N">
+                                                                                    <menuItem title="is not" id="Niq-dZ-Peq">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="hpA-Sf-2eo" customClass="TTMPredicateEditorHiddenRowTemplate">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="c1o-vT-fCu" customClass="TTMPredicateEditorHiddenRowTemplate">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">isHidden</string>
@@ -2578,18 +2596,18 @@
                                                                         </array>
                                                                         <integer key="rightExpressionObject" value="700"/>
                                                                         <popUpMenus>
-                                                                            <menu id="A9P-cH-Pok">
+                                                                            <menu id="kay-y2-eEh">
                                                                                 <items>
-                                                                                    <menuItem title="isHidden" state="on" id="uko-yS-0wU">
+                                                                                    <menuItem title="isHidden" state="on" id="AWf-O2-DWU">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">isHidden</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="XoE-8s-3rf">
+                                                                            <menu id="dsR-u4-fm3">
                                                                                 <items>
-                                                                                    <menuItem title="is" state="on" id="LhA-3v-8fC">
+                                                                                    <menuItem title="is" state="on" id="abf-nl-VJL">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
                                                                                 </items>
@@ -2598,7 +2616,7 @@
                                                                     </predicateEditorRowTemplate>
                                                                 </rowTemplates>
                                                                 <connections>
-                                                                    <binding destination="VIO-0n-UUv" name="value" keyPath="values.filterPredicate5" id="Q1e-in-vhO">
+                                                                    <binding destination="VIO-0n-UUv" name="value" keyPath="values.filterPredicate5" id="NfP-PC-uCf">
                                                                         <dictionary key="options">
                                                                             <string key="NSValueTransformerName">NSKeyedUnarchiveFromData</string>
                                                                         </dictionary>
@@ -2608,62 +2626,62 @@
                                                         </subviews>
                                                         <color key="backgroundColor" white="0.91000002619999998" alpha="1" colorSpace="calibratedWhite"/>
                                                     </clipView>
-                                                    <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="4KM-4A-NgU">
+                                                    <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="r6p-iG-hZr">
                                                         <rect key="frame" x="-100" y="-100" width="360" height="15"/>
                                                         <autoresizingMask key="autoresizingMask"/>
                                                     </scroller>
-                                                    <scroller key="verticalScroller" verticalHuggingPriority="750" horizontal="NO" id="Xch-za-6Nr">
-                                                        <rect key="frame" x="477" y="1" width="15" height="258"/>
+                                                    <scroller key="verticalScroller" verticalHuggingPriority="750" horizontal="NO" id="QGV-Hz-ZBR">
+                                                        <rect key="frame" x="477" y="1" width="15" height="256"/>
                                                         <autoresizingMask key="autoresizingMask"/>
                                                     </scroller>
                                                 </scrollView>
                                             </subviews>
                                             <constraints>
-                                                <constraint firstItem="myt-XN-4g3" firstAttribute="leading" secondItem="lUo-BT-eGj" secondAttribute="leading" constant="17" id="CTS-yc-zP3"/>
-                                                <constraint firstAttribute="bottom" secondItem="myt-XN-4g3" secondAttribute="bottom" constant="17" id="GYt-DH-Fm5"/>
-                                                <constraint firstAttribute="trailing" secondItem="myt-XN-4g3" secondAttribute="trailing" constant="17" id="td2-ka-uHQ"/>
-                                                <constraint firstItem="myt-XN-4g3" firstAttribute="top" secondItem="lUo-BT-eGj" secondAttribute="top" constant="3" id="wq4-PT-oZo"/>
+                                                <constraint firstItem="3Cn-q6-oN3" firstAttribute="leading" secondItem="lUo-BT-eGj" secondAttribute="leading" constant="17" id="7Ps-YS-TWe"/>
+                                                <constraint firstAttribute="trailing" secondItem="3Cn-q6-oN3" secondAttribute="trailing" constant="17" id="A4L-Z8-Amh"/>
+                                                <constraint firstAttribute="bottom" secondItem="3Cn-q6-oN3" secondAttribute="bottom" constant="17" id="ZXU-gZ-V3c"/>
+                                                <constraint firstItem="3Cn-q6-oN3" firstAttribute="top" secondItem="lUo-BT-eGj" secondAttribute="top" constant="3" id="qpz-d0-srI"/>
                                             </constraints>
                                         </view>
                                     </tabViewItem>
                                     <tabViewItem label="6" identifier="6" id="F9E-b6-BOc">
                                         <view key="view" id="Qsi-I7-eOz">
-                                            <rect key="frame" x="10" y="33" width="527" height="280"/>
+                                            <rect key="frame" x="10" y="33" width="527" height="278"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             <subviews>
-                                                <scrollView autohidesScrollers="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LJg-TB-rbH">
-                                                    <rect key="frame" x="17" y="17" width="493" height="260"/>
-                                                    <clipView key="contentView" id="rhP-z4-ere">
-                                                        <rect key="frame" x="1" y="1" width="491" height="258"/>
+                                                <scrollView fixedFrame="YES" autohidesScrollers="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cmo-sl-f0Q">
+                                                    <rect key="frame" x="17" y="17" width="493" height="258"/>
+                                                    <clipView key="contentView" ambiguous="YES" id="dFc-Qd-Ag1">
+                                                        <rect key="frame" x="1" y="1" width="476" height="256"/>
                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                         <subviews>
-                                                            <predicateEditor verticalHuggingPriority="750" nestingMode="compound" rowHeight="25" id="Fft-UT-LWs">
-                                                                <rect key="frame" x="0.0" y="0.0" width="491" height="325"/>
+                                                            <predicateEditor verticalHuggingPriority="750" ambiguous="YES" nestingMode="compound" rowHeight="25" id="WLK-Np-fUg" userLabel="Filter 6 Predicate Editor">
+                                                                <rect key="frame" x="0.0" y="0.0" width="476" height="325"/>
                                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                                                                 <rowTemplates>
-                                                                    <predicateEditorRowTemplate rowType="compound" id="wFo-ei-zAn">
+                                                                    <predicateEditorRowTemplate rowType="compound" id="k2V-cv-tLQ">
                                                                         <popUpMenus>
-                                                                            <menu id="xec-3u-lZo">
+                                                                            <menu id="pTJ-MN-SYY">
                                                                                 <items>
-                                                                                    <menuItem title="Any" state="on" id="8W8-PW-sbt">
+                                                                                    <menuItem title="Any" state="on" id="e7D-lp-qWf">
                                                                                         <integer key="representedObject" value="2"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="All" id="ZsB-DZ-uke">
+                                                                                    <menuItem title="All" id="xUv-Kx-Xsx">
                                                                                         <integer key="representedObject" value="1"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="None" id="rOX-dQ-dfp">
+                                                                                    <menuItem title="None" id="uZ6-LK-aLD">
                                                                                         <integer key="representedObject" value="0"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="qWr-NG-QdL">
+                                                                            <menu id="pje-RW-X6L">
                                                                                 <items>
-                                                                                    <menuItem title="of the following are true" state="on" id="lSP-Ie-eDR"/>
+                                                                                    <menuItem title="of the following are true" state="on" id="z38-Cg-aIi"/>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="Bqq-uL-7oT">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="rme-bM-BUj" customClass="TTMPredicateEditorTextRowTemplate">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">rawText</string>
@@ -2672,43 +2690,46 @@
                                                                         <integer key="rightExpressionObject" value="700"/>
                                                                         <comparisonPredicateOptions key="options" caseInsensitive="YES" diacriticInsensitive="YES"/>
                                                                         <popUpMenus>
-                                                                            <menu id="8cq-up-GVh">
+                                                                            <menu id="H96-AZ-v3t">
                                                                                 <items>
-                                                                                    <menuItem title="task" state="on" id="Ljk-MP-BkD">
+                                                                                    <menuItem title="task" state="on" id="yrN-7a-QkP">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">rawText</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="Fgd-cB-9lE">
+                                                                            <menu id="jpq-TP-OwK">
                                                                                 <items>
-                                                                                    <menuItem title="contains" state="on" id="Dls-n3-Y5o">
+                                                                                    <menuItem title="contains" state="on" id="ZGl-zs-qVS">
                                                                                         <integer key="representedObject" value="99"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="begins with" id="rxo-ES-k5o">
+                                                                                    <menuItem title="does not contain" id="SPz-Sq-Bx9" userLabel="does not contain">
+                                                                                        <integer key="representedObject" value="10"/>
+                                                                                    </menuItem>
+                                                                                    <menuItem title="begins with" id="kpC-At-m9Z">
                                                                                         <integer key="representedObject" value="8"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="ends with" id="ivV-I6-Go6">
+                                                                                    <menuItem title="ends with" id="htE-yR-Kd0">
                                                                                         <integer key="representedObject" value="9"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is" id="6Wq-Fz-pBt">
+                                                                                    <menuItem title="is" id="7O1-9U-w5R">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="XiN-23-WiC">
+                                                                                    <menuItem title="is not" id="F0K-6H-7yc">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="matches" id="rhW-K2-BbE">
+                                                                                    <menuItem title="matches" id="t7X-Uf-6o4">
                                                                                         <integer key="representedObject" value="6"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is like" id="Y1E-Ff-kEe">
+                                                                                    <menuItem title="is like" id="siO-Io-Dag">
                                                                                         <integer key="representedObject" value="7"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="ecf-aQ-2Nk">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="iT8-gd-df2">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">projects</string>
@@ -2717,43 +2738,43 @@
                                                                         <integer key="rightExpressionObject" value="700"/>
                                                                         <comparisonPredicateOptions key="options" caseInsensitive="YES" diacriticInsensitive="YES"/>
                                                                         <popUpMenus>
-                                                                            <menu id="ttV-VC-R1J">
+                                                                            <menu id="Mj5-RL-ciU">
                                                                                 <items>
-                                                                                    <menuItem title="projects" state="on" id="rxw-zq-Y1p">
+                                                                                    <menuItem title="projects" state="on" id="5Xx-YF-ibl">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">projects</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="4ha-jx-98F">
+                                                                            <menu id="fRo-kC-CWW">
                                                                                 <items>
-                                                                                    <menuItem title="contains" state="on" id="Uep-tR-xpv">
+                                                                                    <menuItem title="contains" state="on" id="Jzz-kk-qye">
                                                                                         <integer key="representedObject" value="99"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="begins with" id="XKY-gf-wmZ">
+                                                                                    <menuItem title="begins with" id="1t8-6h-Y7k">
                                                                                         <integer key="representedObject" value="8"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="ends with" id="CR8-gT-w3k">
+                                                                                    <menuItem title="ends with" id="pfK-uM-WkM">
                                                                                         <integer key="representedObject" value="9"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is" id="Pc2-o8-ug0">
+                                                                                    <menuItem title="is" id="tbR-6Y-yUA">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="9AE-cW-wMA">
+                                                                                    <menuItem title="is not" id="JFA-nz-5be">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="matches" id="Q5g-gk-qxY">
+                                                                                    <menuItem title="matches" id="HWU-Qh-Cga">
                                                                                         <integer key="representedObject" value="6"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is like" id="qoH-o0-d4Q">
+                                                                                    <menuItem title="is like" id="SZI-rS-83r">
                                                                                         <integer key="representedObject" value="7"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="e6s-MW-jSl">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="BSM-f9-X0u">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">contexts</string>
@@ -2762,43 +2783,43 @@
                                                                         <integer key="rightExpressionObject" value="700"/>
                                                                         <comparisonPredicateOptions key="options" caseInsensitive="YES" diacriticInsensitive="YES"/>
                                                                         <popUpMenus>
-                                                                            <menu id="Xh4-46-lwz">
+                                                                            <menu id="PCW-zd-nDm">
                                                                                 <items>
-                                                                                    <menuItem title="contexts" state="on" id="Coh-5W-D8G">
+                                                                                    <menuItem title="contexts" state="on" id="4jb-Dv-gKB">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">contexts</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="oht-iM-cNY">
+                                                                            <menu id="CiU-Ts-ueR">
                                                                                 <items>
-                                                                                    <menuItem title="contains" state="on" id="4f2-FA-Fqb">
+                                                                                    <menuItem title="contains" state="on" id="tRQ-lM-QxM">
                                                                                         <integer key="representedObject" value="99"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="begins with" id="YZ0-HY-4m9">
+                                                                                    <menuItem title="begins with" id="EpC-aC-XDV">
                                                                                         <integer key="representedObject" value="8"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="ends with" id="Jie-ZU-9h1">
+                                                                                    <menuItem title="ends with" id="cPN-J6-4eF">
                                                                                         <integer key="representedObject" value="9"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is" id="TPt-dU-c2g">
+                                                                                    <menuItem title="is" id="ddS-qn-Sov">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="4oK-Xc-xKN">
+                                                                                    <menuItem title="is not" id="Tqw-kC-v7D">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="matches" id="hhe-dy-h4W">
+                                                                                    <menuItem title="matches" id="qx3-4a-qez">
                                                                                         <integer key="representedObject" value="6"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is like" id="tbQ-PH-RGC">
+                                                                                    <menuItem title="is like" id="BSi-mo-dq3">
                                                                                         <integer key="representedObject" value="7"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="fLh-dx-CmZ">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="4vQ-K0-DJd">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">priorityText</string>
@@ -2807,40 +2828,40 @@
                                                                         <integer key="rightExpressionObject" value="700"/>
                                                                         <comparisonPredicateOptions key="options" caseInsensitive="YES" diacriticInsensitive="YES"/>
                                                                         <popUpMenus>
-                                                                            <menu id="1ic-86-tZn">
+                                                                            <menu id="6Mw-xl-JCk">
                                                                                 <items>
-                                                                                    <menuItem title="priority" state="on" id="ta5-nM-ePR">
+                                                                                    <menuItem title="priority" state="on" id="ebv-Tk-1L2">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">priorityText</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="ehR-tJ-m8o">
+                                                                            <menu id="pKT-PR-ZAo">
                                                                                 <items>
-                                                                                    <menuItem title="is" state="on" id="doB-aB-5cN">
+                                                                                    <menuItem title="is" state="on" id="Hbe-rS-oh9">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="eie-DT-oNw">
+                                                                                    <menuItem title="is not" id="Dl9-Di-Yn3">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than" id="Gj8-5V-rvv">
+                                                                                    <menuItem title="is less than" id="vn5-0g-cPr">
                                                                                         <integer key="representedObject" value="0"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than" id="lTQ-ed-H6N">
+                                                                                    <menuItem title="is greater than" id="dJo-RV-Prz">
                                                                                         <integer key="representedObject" value="2"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than or equal to" id="cnD-UI-oKa">
+                                                                                    <menuItem title="is less than or equal to" id="XBp-oh-yb1">
                                                                                         <integer key="representedObject" value="1"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than or equal to" id="MuS-E9-7HL">
+                                                                                    <menuItem title="is greater than or equal to" id="dqF-Pd-aeQ">
                                                                                         <integer key="representedObject" value="3"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="cth-6R-3im" customClass="TTMPredicateEditorDateRowTemplate">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="WFo-t1-ILz" customClass="TTMPredicateEditorDateRowTemplate">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">dueDate</string>
@@ -2848,40 +2869,40 @@
                                                                         </array>
                                                                         <integer key="rightExpressionObject" value="900"/>
                                                                         <popUpMenus>
-                                                                            <menu id="Z3N-jZ-hjL">
+                                                                            <menu id="xdT-V4-APz">
                                                                                 <items>
-                                                                                    <menuItem title="due date" state="on" id="UAI-bp-qsE">
+                                                                                    <menuItem title="due date" state="on" id="VjJ-99-gix">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">dueDate</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="hZf-FV-vnL">
+                                                                            <menu id="IJW-6S-hdF">
                                                                                 <items>
-                                                                                    <menuItem title="is" state="on" id="GGW-Nz-vwE">
+                                                                                    <menuItem title="is" state="on" id="ZcU-VV-LZI">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="dJr-jb-mXV">
+                                                                                    <menuItem title="is not" id="VeE-1i-ne7">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than" id="8Lf-LL-1dQ">
+                                                                                    <menuItem title="is less than" id="EeZ-sr-Emb">
                                                                                         <integer key="representedObject" value="0"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than" id="jfX-tZ-yzq">
+                                                                                    <menuItem title="is greater than" id="FRF-sd-CY5">
                                                                                         <integer key="representedObject" value="2"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than or equal to" id="XjK-XR-hEJ">
+                                                                                    <menuItem title="is less than or equal to" id="3sP-Ae-NAu">
                                                                                         <integer key="representedObject" value="1"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than or equal to" id="tyw-Du-qb8">
+                                                                                    <menuItem title="is greater than or equal to" id="prs-x7-1JN">
                                                                                         <integer key="representedObject" value="3"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="vHO-74-nAL" customClass="TTMPredicateEditorDateRowTemplate">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="M0B-K1-Add" customClass="TTMPredicateEditorDateRowTemplate">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">completionDate</string>
@@ -2889,40 +2910,40 @@
                                                                         </array>
                                                                         <integer key="rightExpressionObject" value="900"/>
                                                                         <popUpMenus>
-                                                                            <menu id="Gnc-pj-Rck">
+                                                                            <menu id="BWd-kG-HxS">
                                                                                 <items>
-                                                                                    <menuItem title="completion date" state="on" id="y2j-1u-f1O">
+                                                                                    <menuItem title="completion date" state="on" id="PdC-xj-E0E">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">completionDate</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="63O-Pv-tma">
+                                                                            <menu id="ltX-CU-Wev">
                                                                                 <items>
-                                                                                    <menuItem title="is" state="on" id="3fi-8J-200">
+                                                                                    <menuItem title="is" state="on" id="6Ly-J6-rMk">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="XBu-sn-uc9">
+                                                                                    <menuItem title="is not" id="4i9-hG-Gmk">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than" id="lAR-c3-LsW">
+                                                                                    <menuItem title="is less than" id="XJk-W8-AJa">
                                                                                         <integer key="representedObject" value="0"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than" id="DNx-Un-kwn">
+                                                                                    <menuItem title="is greater than" id="Qno-66-Z53">
                                                                                         <integer key="representedObject" value="2"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than or equal to" id="5dq-Vj-YQ0">
+                                                                                    <menuItem title="is less than or equal to" id="atg-H8-KMf">
                                                                                         <integer key="representedObject" value="1"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than or equal to" id="hQh-X0-4PU">
+                                                                                    <menuItem title="is greater than or equal to" id="iec-li-0u4">
                                                                                         <integer key="representedObject" value="3"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="WoW-1E-jss" customClass="TTMPredicateEditorDateRowTemplate">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="nlf-J4-igi" customClass="TTMPredicateEditorDateRowTemplate">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">creationDate</string>
@@ -2930,40 +2951,40 @@
                                                                         </array>
                                                                         <integer key="rightExpressionObject" value="900"/>
                                                                         <popUpMenus>
-                                                                            <menu id="mGJ-ug-ANX">
+                                                                            <menu id="Hh6-BX-vQZ">
                                                                                 <items>
-                                                                                    <menuItem title="creation date" state="on" id="XDt-YE-DvA">
+                                                                                    <menuItem title="creation date" state="on" id="eTu-fM-YvP">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">creationDate</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="sWO-YV-6nw">
+                                                                            <menu id="PG4-rH-gWf">
                                                                                 <items>
-                                                                                    <menuItem title="is" state="on" id="72V-40-EhT">
+                                                                                    <menuItem title="is" state="on" id="NV8-pZ-0oG">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="XtE-Mu-oGy">
+                                                                                    <menuItem title="is not" id="Mva-7W-XiD">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than" id="AD3-3I-IkB">
+                                                                                    <menuItem title="is less than" id="7IL-r8-9Ig">
                                                                                         <integer key="representedObject" value="0"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than" id="4xi-rn-KMR">
+                                                                                    <menuItem title="is greater than" id="Vad-gd-57b">
                                                                                         <integer key="representedObject" value="2"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than or equal to" id="KEa-ml-hIz">
+                                                                                    <menuItem title="is less than or equal to" id="9mY-Km-2vF">
                                                                                         <integer key="representedObject" value="1"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than or equal to" id="Bbl-8o-XIH">
+                                                                                    <menuItem title="is greater than or equal to" id="hp5-bs-RNz">
                                                                                         <integer key="representedObject" value="3"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="PbW-Hp-ZEU" customClass="TTMPredicateEditorDateRowTemplate">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="ydN-dg-9YE" customClass="TTMPredicateEditorDateRowTemplate">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">thresholdDate</string>
@@ -2971,40 +2992,40 @@
                                                                         </array>
                                                                         <integer key="rightExpressionObject" value="900"/>
                                                                         <popUpMenus>
-                                                                            <menu id="baE-Bx-6Vl">
+                                                                            <menu id="u4v-Ad-Opa">
                                                                                 <items>
-                                                                                    <menuItem title="threshold date" state="on" id="LEa-xs-ddn">
+                                                                                    <menuItem title="threshold date" state="on" id="UWU-5a-BdY">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">thresholdDate</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="e32-Pr-8GQ">
+                                                                            <menu id="IIV-Tw-fno">
                                                                                 <items>
-                                                                                    <menuItem title="is" state="on" id="TJr-sX-gyQ">
+                                                                                    <menuItem title="is" state="on" id="muW-9V-DlJ">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="Cvm-nd-bia">
+                                                                                    <menuItem title="is not" id="X11-aQ-tJA">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than" id="T2o-fP-BNw">
+                                                                                    <menuItem title="is less than" id="2zL-Na-vLf">
                                                                                         <integer key="representedObject" value="0"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than" id="Yh1-jB-U9q">
+                                                                                    <menuItem title="is greater than" id="x6U-Wj-o7y">
                                                                                         <integer key="representedObject" value="2"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than or equal to" id="IMV-bY-HVV">
+                                                                                    <menuItem title="is less than or equal to" id="NV5-wz-2d9">
                                                                                         <integer key="representedObject" value="1"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than or equal to" id="fJo-he-ZQE">
+                                                                                    <menuItem title="is greater than or equal to" id="Jcq-xt-6BL">
                                                                                         <integer key="representedObject" value="3"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="sma-92-4V1" customClass="TTMPredicateEditorCompletedRowTemplate">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="04Z-sl-kBE" customClass="TTMPredicateEditorCompletedRowTemplate">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">completed</string>
@@ -3012,25 +3033,25 @@
                                                                         </array>
                                                                         <integer key="rightExpressionObject" value="300"/>
                                                                         <popUpMenus>
-                                                                            <menu id="SQv-fV-Fkx">
+                                                                            <menu id="5E3-BP-ksp">
                                                                                 <items>
-                                                                                    <menuItem title="completed" state="on" id="Lb5-4h-e13">
+                                                                                    <menuItem title="completed" state="on" id="pIo-wI-iwN">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">completed</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="zUK-Dn-AVy">
+                                                                            <menu id="Syy-yH-jLy">
                                                                                 <items>
-                                                                                    <menuItem title="is" state="on" id="hQC-Cf-cSd">
+                                                                                    <menuItem title="is" state="on" id="MUl-Mb-Jrk">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="Crs-9X-1eO" customClass="TTMPredicateEditorDueRowTemplate">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="b61-PO-vJC" customClass="TTMPredicateEditorDueRowTemplate">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">dueState</string>
@@ -3038,28 +3059,28 @@
                                                                         </array>
                                                                         <integer key="rightExpressionObject" value="300"/>
                                                                         <popUpMenus>
-                                                                            <menu id="Znd-Ml-NYW">
+                                                                            <menu id="S20-hr-RsO">
                                                                                 <items>
-                                                                                    <menuItem title="dueState" state="on" id="fT2-xn-l2l">
+                                                                                    <menuItem title="dueState" state="on" id="XOi-Wt-SrY">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">dueState</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="cjI-Nl-wkg">
+                                                                            <menu id="Odn-O4-lIi">
                                                                                 <items>
-                                                                                    <menuItem title="is" state="on" id="KcE-yW-h63">
+                                                                                    <menuItem title="is" state="on" id="WKw-EU-ezC">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="7yz-Mc-fpq">
+                                                                                    <menuItem title="is not" id="KUA-26-4fX">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="C7E-j6-dkP" customClass="TTMPredicateEditorThresholdRowTemplate">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="nTK-iC-lAK" customClass="TTMPredicateEditorThresholdRowTemplate">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">thresholdState</string>
@@ -3067,28 +3088,28 @@
                                                                         </array>
                                                                         <integer key="rightExpressionObject" value="300"/>
                                                                         <popUpMenus>
-                                                                            <menu id="pKn-OD-xSf">
+                                                                            <menu id="Z4R-7O-Ge2">
                                                                                 <items>
-                                                                                    <menuItem title="thresholdState" state="on" id="mGe-Cf-ajg">
+                                                                                    <menuItem title="thresholdState" state="on" id="qmp-lL-maP">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">thresholdState</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="tAL-kv-emy">
+                                                                            <menu id="aEL-uT-S0d">
                                                                                 <items>
-                                                                                    <menuItem title="is" state="on" id="XFh-mJ-oHn">
+                                                                                    <menuItem title="is" state="on" id="z5B-ua-D7B">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="7D7-fI-MVc">
+                                                                                    <menuItem title="is not" id="Np0-KR-d0n">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="tmd-jv-HC4" customClass="TTMPredicateEditorHiddenRowTemplate">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="pAt-Oh-dP3" customClass="TTMPredicateEditorHiddenRowTemplate">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">isHidden</string>
@@ -3096,18 +3117,18 @@
                                                                         </array>
                                                                         <integer key="rightExpressionObject" value="700"/>
                                                                         <popUpMenus>
-                                                                            <menu id="2CD-Tn-Yk9">
+                                                                            <menu id="9Xq-zq-C62">
                                                                                 <items>
-                                                                                    <menuItem title="isHidden" state="on" id="1BT-rD-IRJ">
+                                                                                    <menuItem title="isHidden" state="on" id="LWc-R5-fAM">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">isHidden</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="x5F-Sa-7cO">
+                                                                            <menu id="eVj-ZH-8ZI">
                                                                                 <items>
-                                                                                    <menuItem title="is" state="on" id="zfi-at-19d">
+                                                                                    <menuItem title="is" state="on" id="WWz-1j-NwK">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
                                                                                 </items>
@@ -3116,7 +3137,7 @@
                                                                     </predicateEditorRowTemplate>
                                                                 </rowTemplates>
                                                                 <connections>
-                                                                    <binding destination="VIO-0n-UUv" name="value" keyPath="values.filterPredicate6" id="Lk0-wU-BwF">
+                                                                    <binding destination="VIO-0n-UUv" name="value" keyPath="values.filterPredicate6" id="Gnn-MG-ceY">
                                                                         <dictionary key="options">
                                                                             <string key="NSValueTransformerName">NSKeyedUnarchiveFromData</string>
                                                                         </dictionary>
@@ -3126,62 +3147,56 @@
                                                         </subviews>
                                                         <color key="backgroundColor" white="0.91000002619999998" alpha="1" colorSpace="calibratedWhite"/>
                                                     </clipView>
-                                                    <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="mcz-Kb-kD8">
+                                                    <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="aG8-Zn-sCp">
                                                         <rect key="frame" x="-100" y="-100" width="360" height="15"/>
                                                         <autoresizingMask key="autoresizingMask"/>
                                                     </scroller>
-                                                    <scroller key="verticalScroller" verticalHuggingPriority="750" horizontal="NO" id="2bq-D6-2te">
-                                                        <rect key="frame" x="477" y="1" width="15" height="258"/>
+                                                    <scroller key="verticalScroller" verticalHuggingPriority="750" horizontal="NO" id="a3q-1v-ewQ">
+                                                        <rect key="frame" x="477" y="1" width="15" height="256"/>
                                                         <autoresizingMask key="autoresizingMask"/>
                                                     </scroller>
                                                 </scrollView>
                                             </subviews>
-                                            <constraints>
-                                                <constraint firstItem="LJg-TB-rbH" firstAttribute="leading" secondItem="Qsi-I7-eOz" secondAttribute="leading" constant="17" id="7lS-nZ-4af"/>
-                                                <constraint firstItem="LJg-TB-rbH" firstAttribute="top" secondItem="Qsi-I7-eOz" secondAttribute="top" constant="3" id="oYT-k3-8SL"/>
-                                                <constraint firstAttribute="trailing" secondItem="LJg-TB-rbH" secondAttribute="trailing" constant="17" id="sfx-YI-8Qu"/>
-                                                <constraint firstAttribute="bottom" secondItem="LJg-TB-rbH" secondAttribute="bottom" constant="17" id="v9q-IO-53F"/>
-                                            </constraints>
                                         </view>
                                     </tabViewItem>
                                     <tabViewItem label="7" identifier="7" id="JNf-5E-9je">
                                         <view key="view" id="D1Y-zM-0fz">
-                                            <rect key="frame" x="10" y="33" width="527" height="280"/>
+                                            <rect key="frame" x="10" y="33" width="527" height="278"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             <subviews>
-                                                <scrollView autohidesScrollers="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="J8P-00-hHa">
-                                                    <rect key="frame" x="17" y="17" width="493" height="260"/>
-                                                    <clipView key="contentView" id="nQT-Sx-oIv">
-                                                        <rect key="frame" x="1" y="1" width="491" height="258"/>
+                                                <scrollView fixedFrame="YES" autohidesScrollers="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nwq-Tb-7Yn">
+                                                    <rect key="frame" x="17" y="17" width="493" height="258"/>
+                                                    <clipView key="contentView" ambiguous="YES" id="FKB-1w-yYS">
+                                                        <rect key="frame" x="1" y="1" width="476" height="256"/>
                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                         <subviews>
-                                                            <predicateEditor verticalHuggingPriority="750" nestingMode="compound" rowHeight="25" id="abs-37-qFl">
-                                                                <rect key="frame" x="0.0" y="0.0" width="491" height="325"/>
+                                                            <predicateEditor verticalHuggingPriority="750" ambiguous="YES" nestingMode="compound" rowHeight="25" id="z57-jf-7VI" userLabel="Filter 7 Predicate Editor">
+                                                                <rect key="frame" x="0.0" y="0.0" width="476" height="325"/>
                                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                                                                 <rowTemplates>
-                                                                    <predicateEditorRowTemplate rowType="compound" id="lgC-Ia-v3w">
+                                                                    <predicateEditorRowTemplate rowType="compound" id="onL-ei-Bux">
                                                                         <popUpMenus>
-                                                                            <menu id="n4E-hf-nFs">
+                                                                            <menu id="ybZ-27-9U4">
                                                                                 <items>
-                                                                                    <menuItem title="Any" state="on" id="lD2-qR-oX3">
+                                                                                    <menuItem title="Any" state="on" id="9Hw-Lv-NFo">
                                                                                         <integer key="representedObject" value="2"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="All" id="tOy-fy-6Aw">
+                                                                                    <menuItem title="All" id="DH3-aS-cmF">
                                                                                         <integer key="representedObject" value="1"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="None" id="lg7-DH-4EQ">
+                                                                                    <menuItem title="None" id="UJ9-1X-k4L">
                                                                                         <integer key="representedObject" value="0"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="zKQ-5h-xJU">
+                                                                            <menu id="v3l-Ge-fXr">
                                                                                 <items>
-                                                                                    <menuItem title="of the following are true" state="on" id="Iy8-F1-X5p"/>
+                                                                                    <menuItem title="of the following are true" state="on" id="Iqv-Q0-9Hf"/>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="aRz-aA-fig">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="hYS-vk-U1R" customClass="TTMPredicateEditorTextRowTemplate">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">rawText</string>
@@ -3190,43 +3205,46 @@
                                                                         <integer key="rightExpressionObject" value="700"/>
                                                                         <comparisonPredicateOptions key="options" caseInsensitive="YES" diacriticInsensitive="YES"/>
                                                                         <popUpMenus>
-                                                                            <menu id="gOt-R7-mlQ">
+                                                                            <menu id="C06-TP-0Pq">
                                                                                 <items>
-                                                                                    <menuItem title="task" state="on" id="ndt-fN-0Ke">
+                                                                                    <menuItem title="task" state="on" id="HCW-D6-5HX">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">rawText</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="Zek-bY-hrE">
+                                                                            <menu id="dCQ-M9-DI2">
                                                                                 <items>
-                                                                                    <menuItem title="contains" state="on" id="oSj-lH-W7U">
+                                                                                    <menuItem title="contains" state="on" id="dRf-7u-RxU">
                                                                                         <integer key="representedObject" value="99"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="begins with" id="f7j-ZK-ZmH">
+                                                                                    <menuItem title="does not contain" id="SO3-37-XeG" userLabel="does not contain">
+                                                                                        <integer key="representedObject" value="10"/>
+                                                                                    </menuItem>
+                                                                                    <menuItem title="begins with" id="f6G-7g-KZX">
                                                                                         <integer key="representedObject" value="8"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="ends with" id="hBg-7H-gy4">
+                                                                                    <menuItem title="ends with" id="zyu-04-MQ9">
                                                                                         <integer key="representedObject" value="9"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is" id="Iek-Xe-4L8">
+                                                                                    <menuItem title="is" id="LGW-jJ-mUH">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="Wcp-4z-3d2">
+                                                                                    <menuItem title="is not" id="efC-AY-wNl">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="matches" id="oF1-Oz-4mx">
+                                                                                    <menuItem title="matches" id="gB5-UQ-muc">
                                                                                         <integer key="representedObject" value="6"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is like" id="lhV-w2-7YE">
+                                                                                    <menuItem title="is like" id="4Pn-hf-Q8c">
                                                                                         <integer key="representedObject" value="7"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="prm-3U-adZ">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="nSd-2L-ect">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">projects</string>
@@ -3235,43 +3253,43 @@
                                                                         <integer key="rightExpressionObject" value="700"/>
                                                                         <comparisonPredicateOptions key="options" caseInsensitive="YES" diacriticInsensitive="YES"/>
                                                                         <popUpMenus>
-                                                                            <menu id="ABv-53-umG">
+                                                                            <menu id="aae-n5-4D7">
                                                                                 <items>
-                                                                                    <menuItem title="projects" state="on" id="Ytj-uq-56Y">
+                                                                                    <menuItem title="projects" state="on" id="VS3-v1-ne0">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">projects</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="8cd-xd-eMY">
+                                                                            <menu id="i8h-aQ-uTp">
                                                                                 <items>
-                                                                                    <menuItem title="contains" state="on" id="U75-Qg-Ym9">
+                                                                                    <menuItem title="contains" state="on" id="aKY-7r-IUI">
                                                                                         <integer key="representedObject" value="99"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="begins with" id="vaP-og-gyf">
+                                                                                    <menuItem title="begins with" id="J1K-CJ-vCh">
                                                                                         <integer key="representedObject" value="8"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="ends with" id="FBL-U4-QsZ">
+                                                                                    <menuItem title="ends with" id="uef-sM-OQZ">
                                                                                         <integer key="representedObject" value="9"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is" id="4ti-KJ-HEA">
+                                                                                    <menuItem title="is" id="4fJ-Mw-sIu">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="pJa-2q-gGG">
+                                                                                    <menuItem title="is not" id="MwR-UA-chp">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="matches" id="vCv-01-C0k">
+                                                                                    <menuItem title="matches" id="QBY-1d-X8K">
                                                                                         <integer key="representedObject" value="6"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is like" id="dzR-ER-raY">
+                                                                                    <menuItem title="is like" id="piZ-aN-2rG">
                                                                                         <integer key="representedObject" value="7"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="4je-6a-QYx">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="pM6-b3-ho8">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">contexts</string>
@@ -3280,43 +3298,43 @@
                                                                         <integer key="rightExpressionObject" value="700"/>
                                                                         <comparisonPredicateOptions key="options" caseInsensitive="YES" diacriticInsensitive="YES"/>
                                                                         <popUpMenus>
-                                                                            <menu id="uFU-Vd-wdT">
+                                                                            <menu id="zfl-SR-g9b">
                                                                                 <items>
-                                                                                    <menuItem title="contexts" state="on" id="cmW-9d-5KD">
+                                                                                    <menuItem title="contexts" state="on" id="qNF-Sw-Ovb">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">contexts</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="NrH-uD-kfE">
+                                                                            <menu id="jbg-YD-VNN">
                                                                                 <items>
-                                                                                    <menuItem title="contains" state="on" id="7bW-jT-XIh">
+                                                                                    <menuItem title="contains" state="on" id="teB-W7-U2E">
                                                                                         <integer key="representedObject" value="99"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="begins with" id="He9-xa-bmI">
+                                                                                    <menuItem title="begins with" id="iGy-Oq-pp3">
                                                                                         <integer key="representedObject" value="8"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="ends with" id="ITT-jX-gaY">
+                                                                                    <menuItem title="ends with" id="l7t-A5-lfX">
                                                                                         <integer key="representedObject" value="9"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is" id="qEI-Ij-qjH">
+                                                                                    <menuItem title="is" id="XLg-RZ-Dcv">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="9FS-bc-v3h">
+                                                                                    <menuItem title="is not" id="2ZW-Xz-X1l">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="matches" id="A4n-Bt-xw1">
+                                                                                    <menuItem title="matches" id="khy-Eu-SnJ">
                                                                                         <integer key="representedObject" value="6"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is like" id="hx8-eo-Hcn">
+                                                                                    <menuItem title="is like" id="QeQ-5Y-CmG">
                                                                                         <integer key="representedObject" value="7"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="qTU-Hp-zOV">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="OLd-Zc-uh5">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">priorityText</string>
@@ -3325,40 +3343,40 @@
                                                                         <integer key="rightExpressionObject" value="700"/>
                                                                         <comparisonPredicateOptions key="options" caseInsensitive="YES" diacriticInsensitive="YES"/>
                                                                         <popUpMenus>
-                                                                            <menu id="oCN-SS-5S7">
+                                                                            <menu id="39g-Zq-MK6">
                                                                                 <items>
-                                                                                    <menuItem title="priority" state="on" id="fke-Pn-07S">
+                                                                                    <menuItem title="priority" state="on" id="Bmk-Zf-uiG">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">priorityText</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="BJK-sa-wWF">
+                                                                            <menu id="rTl-4o-bSA">
                                                                                 <items>
-                                                                                    <menuItem title="is" state="on" id="ZqP-yI-Rkq">
+                                                                                    <menuItem title="is" state="on" id="8eI-3Y-ZR4">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="ctQ-FX-sRx">
+                                                                                    <menuItem title="is not" id="wyw-y0-d45">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than" id="A5n-ik-ofk">
+                                                                                    <menuItem title="is less than" id="uLx-3r-aav">
                                                                                         <integer key="representedObject" value="0"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than" id="yhT-C1-z8u">
+                                                                                    <menuItem title="is greater than" id="UE9-Mq-b0x">
                                                                                         <integer key="representedObject" value="2"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than or equal to" id="jXL-xW-xim">
+                                                                                    <menuItem title="is less than or equal to" id="PIg-WW-HbV">
                                                                                         <integer key="representedObject" value="1"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than or equal to" id="ekt-eZ-RTm">
+                                                                                    <menuItem title="is greater than or equal to" id="cMj-lk-iDd">
                                                                                         <integer key="representedObject" value="3"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="SlP-ae-9kr" customClass="TTMPredicateEditorDateRowTemplate">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="yPY-qH-Ush" customClass="TTMPredicateEditorDateRowTemplate">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">dueDate</string>
@@ -3366,40 +3384,40 @@
                                                                         </array>
                                                                         <integer key="rightExpressionObject" value="900"/>
                                                                         <popUpMenus>
-                                                                            <menu id="fPB-wA-V6z">
+                                                                            <menu id="97K-E2-2Gh">
                                                                                 <items>
-                                                                                    <menuItem title="due date" state="on" id="1jz-6C-TCi">
+                                                                                    <menuItem title="due date" state="on" id="LA8-sJ-e7g">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">dueDate</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="aKY-Ng-RsS">
+                                                                            <menu id="QQH-3T-FEr">
                                                                                 <items>
-                                                                                    <menuItem title="is" state="on" id="UWg-gF-Dxp">
+                                                                                    <menuItem title="is" state="on" id="XJA-dr-lKt">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="Pqf-xI-Meb">
+                                                                                    <menuItem title="is not" id="IS1-a3-HiJ">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than" id="FnH-BR-Pz1">
+                                                                                    <menuItem title="is less than" id="HGo-k8-YTC">
                                                                                         <integer key="representedObject" value="0"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than" id="4rY-2c-oB5">
+                                                                                    <menuItem title="is greater than" id="t6q-Xa-HNP">
                                                                                         <integer key="representedObject" value="2"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than or equal to" id="KLE-ds-l3e">
+                                                                                    <menuItem title="is less than or equal to" id="W1c-Bf-Ed7">
                                                                                         <integer key="representedObject" value="1"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than or equal to" id="MjV-La-s18">
+                                                                                    <menuItem title="is greater than or equal to" id="eHI-1m-nb2">
                                                                                         <integer key="representedObject" value="3"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="ins-MG-VFQ" customClass="TTMPredicateEditorDateRowTemplate">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="mKt-HL-ikQ" customClass="TTMPredicateEditorDateRowTemplate">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">completionDate</string>
@@ -3407,40 +3425,40 @@
                                                                         </array>
                                                                         <integer key="rightExpressionObject" value="900"/>
                                                                         <popUpMenus>
-                                                                            <menu id="EAv-Sm-AgB">
+                                                                            <menu id="7Sf-bg-k4n">
                                                                                 <items>
-                                                                                    <menuItem title="completion date" state="on" id="TNY-nU-pD0">
+                                                                                    <menuItem title="completion date" state="on" id="TsD-KZ-s7K">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">completionDate</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="Ixq-HE-VaG">
+                                                                            <menu id="LgL-5h-Tx3">
                                                                                 <items>
-                                                                                    <menuItem title="is" state="on" id="gfs-vq-NDI">
+                                                                                    <menuItem title="is" state="on" id="Mip-ca-tMs">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="XKP-pf-CXP">
+                                                                                    <menuItem title="is not" id="rtf-gX-dMj">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than" id="nAk-lk-5gf">
+                                                                                    <menuItem title="is less than" id="CcT-JG-Ece">
                                                                                         <integer key="representedObject" value="0"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than" id="CBy-XV-jw7">
+                                                                                    <menuItem title="is greater than" id="egc-Qv-9fR">
                                                                                         <integer key="representedObject" value="2"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than or equal to" id="2uz-Uy-fYy">
+                                                                                    <menuItem title="is less than or equal to" id="PvT-dN-4dA">
                                                                                         <integer key="representedObject" value="1"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than or equal to" id="RZk-N5-x2E">
+                                                                                    <menuItem title="is greater than or equal to" id="8dL-ee-BbC">
                                                                                         <integer key="representedObject" value="3"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="4Qk-QF-J6v" customClass="TTMPredicateEditorDateRowTemplate">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="QCb-5f-OoA" customClass="TTMPredicateEditorDateRowTemplate">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">creationDate</string>
@@ -3448,40 +3466,40 @@
                                                                         </array>
                                                                         <integer key="rightExpressionObject" value="900"/>
                                                                         <popUpMenus>
-                                                                            <menu id="HgE-gc-SoY">
+                                                                            <menu id="inf-ln-XJ3">
                                                                                 <items>
-                                                                                    <menuItem title="creation date" state="on" id="klc-01-1O3">
+                                                                                    <menuItem title="creation date" state="on" id="MhX-pB-FlO">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">creationDate</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="enp-YH-R2Y">
+                                                                            <menu id="pFt-xe-tse">
                                                                                 <items>
-                                                                                    <menuItem title="is" state="on" id="c7y-Iz-kPy">
+                                                                                    <menuItem title="is" state="on" id="1QX-mD-FzT">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="Ul0-zJ-fid">
+                                                                                    <menuItem title="is not" id="Ms4-cG-T2z">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than" id="ITj-rY-L6P">
+                                                                                    <menuItem title="is less than" id="gvO-gZ-UX3">
                                                                                         <integer key="representedObject" value="0"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than" id="eWo-e8-oJr">
+                                                                                    <menuItem title="is greater than" id="kdg-6H-X2o">
                                                                                         <integer key="representedObject" value="2"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than or equal to" id="pXj-a0-YSw">
+                                                                                    <menuItem title="is less than or equal to" id="mRC-aP-5iq">
                                                                                         <integer key="representedObject" value="1"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than or equal to" id="BQs-G8-9TE">
+                                                                                    <menuItem title="is greater than or equal to" id="4sL-tt-Hjq">
                                                                                         <integer key="representedObject" value="3"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="7zM-v0-b3f" customClass="TTMPredicateEditorDateRowTemplate">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="YVr-eE-q9F" customClass="TTMPredicateEditorDateRowTemplate">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">thresholdDate</string>
@@ -3489,40 +3507,40 @@
                                                                         </array>
                                                                         <integer key="rightExpressionObject" value="900"/>
                                                                         <popUpMenus>
-                                                                            <menu id="pOa-gD-kw3">
+                                                                            <menu id="6et-CZ-UlF">
                                                                                 <items>
-                                                                                    <menuItem title="threshold date" state="on" id="LM6-aE-qkg">
+                                                                                    <menuItem title="threshold date" state="on" id="czf-yo-u6r">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">thresholdDate</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="mYs-gM-xgu">
+                                                                            <menu id="KFf-eS-CEr">
                                                                                 <items>
-                                                                                    <menuItem title="is" state="on" id="5N9-lO-oJN">
+                                                                                    <menuItem title="is" state="on" id="9Z6-5v-afB">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="pnS-Ml-dZa">
+                                                                                    <menuItem title="is not" id="tyf-op-Lyk">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than" id="Y4D-UK-Goz">
+                                                                                    <menuItem title="is less than" id="fhb-Pb-upA">
                                                                                         <integer key="representedObject" value="0"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than" id="0GV-IJ-4Fn">
+                                                                                    <menuItem title="is greater than" id="3SQ-iG-jkR">
                                                                                         <integer key="representedObject" value="2"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than or equal to" id="VsS-CI-fRI">
+                                                                                    <menuItem title="is less than or equal to" id="Nv8-GY-Mnt">
                                                                                         <integer key="representedObject" value="1"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than or equal to" id="eI5-Ed-lFM">
+                                                                                    <menuItem title="is greater than or equal to" id="Oon-5D-6pN">
                                                                                         <integer key="representedObject" value="3"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="kJ9-4W-Ktk" customClass="TTMPredicateEditorCompletedRowTemplate">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="LiM-BX-SwX" customClass="TTMPredicateEditorCompletedRowTemplate">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">completed</string>
@@ -3530,25 +3548,25 @@
                                                                         </array>
                                                                         <integer key="rightExpressionObject" value="300"/>
                                                                         <popUpMenus>
-                                                                            <menu id="Gyt-dh-qxc">
+                                                                            <menu id="jsW-LT-EpC">
                                                                                 <items>
-                                                                                    <menuItem title="completed" state="on" id="Fjb-sh-taT">
+                                                                                    <menuItem title="completed" state="on" id="7ZW-wZ-jJA">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">completed</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="DM1-MO-G9M">
+                                                                            <menu id="UdJ-Ge-Yo6">
                                                                                 <items>
-                                                                                    <menuItem title="is" state="on" id="yWz-Aw-K1w">
+                                                                                    <menuItem title="is" state="on" id="wcz-8q-MJn">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="oAF-DT-xMw" customClass="TTMPredicateEditorDueRowTemplate">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="n9S-77-8Gv" customClass="TTMPredicateEditorDueRowTemplate">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">dueState</string>
@@ -3556,28 +3574,28 @@
                                                                         </array>
                                                                         <integer key="rightExpressionObject" value="300"/>
                                                                         <popUpMenus>
-                                                                            <menu id="O5f-qv-iME">
+                                                                            <menu id="zyP-JB-P4k">
                                                                                 <items>
-                                                                                    <menuItem title="dueState" state="on" id="Rbb-O5-cI5">
+                                                                                    <menuItem title="dueState" state="on" id="fSG-bN-TiB">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">dueState</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="CTu-kb-H8h">
+                                                                            <menu id="4ve-Fn-mN9">
                                                                                 <items>
-                                                                                    <menuItem title="is" state="on" id="cwq-wH-8iW">
+                                                                                    <menuItem title="is" state="on" id="fyy-4m-QCu">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="W7W-bC-BFx">
+                                                                                    <menuItem title="is not" id="dH7-l0-2L2">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="fv0-RT-SW2" customClass="TTMPredicateEditorThresholdRowTemplate">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="YtL-z8-ryZ" customClass="TTMPredicateEditorThresholdRowTemplate">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">thresholdState</string>
@@ -3585,28 +3603,28 @@
                                                                         </array>
                                                                         <integer key="rightExpressionObject" value="300"/>
                                                                         <popUpMenus>
-                                                                            <menu id="7Fc-it-7tT">
+                                                                            <menu id="434-25-kiL">
                                                                                 <items>
-                                                                                    <menuItem title="thresholdState" state="on" id="tWf-6b-iuR">
+                                                                                    <menuItem title="thresholdState" state="on" id="0V4-cN-kn0">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">thresholdState</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="ClP-ty-Sat">
+                                                                            <menu id="hlB-Xu-KNN">
                                                                                 <items>
-                                                                                    <menuItem title="is" state="on" id="YLn-rc-MYV">
+                                                                                    <menuItem title="is" state="on" id="W79-NN-Xpc">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="Th5-Fm-KRI">
+                                                                                    <menuItem title="is not" id="zjf-cy-kFU">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="B5h-km-mvg" customClass="TTMPredicateEditorHiddenRowTemplate">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="Bhn-WE-LtA" customClass="TTMPredicateEditorHiddenRowTemplate">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">isHidden</string>
@@ -3614,18 +3632,18 @@
                                                                         </array>
                                                                         <integer key="rightExpressionObject" value="700"/>
                                                                         <popUpMenus>
-                                                                            <menu id="Luk-0i-DIl">
+                                                                            <menu id="mRn-IY-A3H">
                                                                                 <items>
-                                                                                    <menuItem title="isHidden" state="on" id="6mq-Ea-ReL">
+                                                                                    <menuItem title="isHidden" state="on" id="Xsh-gY-s7Z">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">isHidden</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="cVu-KT-L4c">
+                                                                            <menu id="3ai-ZH-Ofe">
                                                                                 <items>
-                                                                                    <menuItem title="is" state="on" id="tCr-xk-cc9">
+                                                                                    <menuItem title="is" state="on" id="7kG-kD-bBs">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
                                                                                 </items>
@@ -3634,7 +3652,7 @@
                                                                     </predicateEditorRowTemplate>
                                                                 </rowTemplates>
                                                                 <connections>
-                                                                    <binding destination="VIO-0n-UUv" name="value" keyPath="values.filterPredicate7" id="zOI-8I-1Pk">
+                                                                    <binding destination="VIO-0n-UUv" name="value" keyPath="values.filterPredicate7" id="avN-Z0-3yN">
                                                                         <dictionary key="options">
                                                                             <string key="NSValueTransformerName">NSKeyedUnarchiveFromData</string>
                                                                         </dictionary>
@@ -3644,62 +3662,56 @@
                                                         </subviews>
                                                         <color key="backgroundColor" white="0.91000002619999998" alpha="1" colorSpace="calibratedWhite"/>
                                                     </clipView>
-                                                    <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="Uig-zC-VEe">
+                                                    <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="cWu-cG-Cr5">
                                                         <rect key="frame" x="-100" y="-100" width="360" height="15"/>
                                                         <autoresizingMask key="autoresizingMask"/>
                                                     </scroller>
-                                                    <scroller key="verticalScroller" verticalHuggingPriority="750" horizontal="NO" id="JkQ-8M-KaS">
-                                                        <rect key="frame" x="477" y="1" width="15" height="258"/>
+                                                    <scroller key="verticalScroller" verticalHuggingPriority="750" horizontal="NO" id="Uuc-WY-sIt">
+                                                        <rect key="frame" x="477" y="1" width="15" height="256"/>
                                                         <autoresizingMask key="autoresizingMask"/>
                                                     </scroller>
                                                 </scrollView>
                                             </subviews>
-                                            <constraints>
-                                                <constraint firstItem="J8P-00-hHa" firstAttribute="leading" secondItem="D1Y-zM-0fz" secondAttribute="leading" constant="17" id="B2t-Rl-KLu"/>
-                                                <constraint firstAttribute="trailing" secondItem="J8P-00-hHa" secondAttribute="trailing" constant="17" id="CAN-Nl-Tqe"/>
-                                                <constraint firstItem="J8P-00-hHa" firstAttribute="top" secondItem="D1Y-zM-0fz" secondAttribute="top" constant="3" id="pGd-sT-D2t"/>
-                                                <constraint firstAttribute="bottom" secondItem="J8P-00-hHa" secondAttribute="bottom" constant="17" id="zWR-hs-5RG"/>
-                                            </constraints>
                                         </view>
                                     </tabViewItem>
                                     <tabViewItem label="8" identifier="8" id="Yi5-lU-VDJ">
                                         <view key="view" id="GUo-xp-z9j">
-                                            <rect key="frame" x="10" y="33" width="527" height="280"/>
+                                            <rect key="frame" x="10" y="33" width="527" height="278"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             <subviews>
-                                                <scrollView autohidesScrollers="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="e2Z-r8-sHg">
-                                                    <rect key="frame" x="17" y="17" width="493" height="260"/>
-                                                    <clipView key="contentView" id="YX2-Z4-PmF">
-                                                        <rect key="frame" x="1" y="1" width="491" height="258"/>
+                                                <scrollView fixedFrame="YES" autohidesScrollers="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="CIX-cv-Obf">
+                                                    <rect key="frame" x="17" y="17" width="493" height="258"/>
+                                                    <clipView key="contentView" ambiguous="YES" id="J7f-Fw-8AR">
+                                                        <rect key="frame" x="1" y="1" width="476" height="256"/>
                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                         <subviews>
-                                                            <predicateEditor verticalHuggingPriority="750" nestingMode="compound" rowHeight="25" id="m5a-mt-V4E">
-                                                                <rect key="frame" x="0.0" y="0.0" width="491" height="325"/>
+                                                            <predicateEditor verticalHuggingPriority="750" ambiguous="YES" nestingMode="compound" rowHeight="25" id="6aD-Lp-Zdw" userLabel="Filter 8 Predicate Editor">
+                                                                <rect key="frame" x="0.0" y="0.0" width="476" height="325"/>
                                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                                                                 <rowTemplates>
-                                                                    <predicateEditorRowTemplate rowType="compound" id="UOZ-Wg-dsx">
+                                                                    <predicateEditorRowTemplate rowType="compound" id="mp3-Lz-5hr">
                                                                         <popUpMenus>
-                                                                            <menu id="zw7-Th-fvx">
+                                                                            <menu id="hWC-q8-Fci">
                                                                                 <items>
-                                                                                    <menuItem title="Any" state="on" id="z2S-So-9RH">
+                                                                                    <menuItem title="Any" state="on" id="tdY-Fh-fdM">
                                                                                         <integer key="representedObject" value="2"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="All" id="NFk-yu-0ax">
+                                                                                    <menuItem title="All" id="QvT-pE-fSV">
                                                                                         <integer key="representedObject" value="1"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="None" id="dHp-8f-oQ9">
+                                                                                    <menuItem title="None" id="Cyh-5f-EpK">
                                                                                         <integer key="representedObject" value="0"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="qyx-C5-yJR">
+                                                                            <menu id="TKd-Xq-gl7">
                                                                                 <items>
-                                                                                    <menuItem title="of the following are true" state="on" id="PVn-Ee-Lwi"/>
+                                                                                    <menuItem title="of the following are true" state="on" id="0bg-vr-h8z"/>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="esv-52-RWg">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="jBr-LT-Rvl" customClass="TTMPredicateEditorTextRowTemplate">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">rawText</string>
@@ -3708,43 +3720,46 @@
                                                                         <integer key="rightExpressionObject" value="700"/>
                                                                         <comparisonPredicateOptions key="options" caseInsensitive="YES" diacriticInsensitive="YES"/>
                                                                         <popUpMenus>
-                                                                            <menu id="Umg-m2-WNU">
+                                                                            <menu id="1YU-4N-gCc">
                                                                                 <items>
-                                                                                    <menuItem title="task" state="on" id="5Qn-pn-yQe">
+                                                                                    <menuItem title="task" state="on" id="n5d-gk-7e5">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">rawText</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="6DP-wA-eTQ">
+                                                                            <menu id="kni-1v-DqB">
                                                                                 <items>
-                                                                                    <menuItem title="contains" state="on" id="phz-UL-Zn3">
+                                                                                    <menuItem title="contains" state="on" id="wwC-Zl-4Ws">
                                                                                         <integer key="representedObject" value="99"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="begins with" id="8uz-bo-37B">
+                                                                                    <menuItem title="does not contain" id="S0f-8w-J4B" userLabel="does not contain">
+                                                                                        <integer key="representedObject" value="10"/>
+                                                                                    </menuItem>
+                                                                                    <menuItem title="begins with" id="VNl-K9-mjr">
                                                                                         <integer key="representedObject" value="8"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="ends with" id="v0v-WM-Ufb">
+                                                                                    <menuItem title="ends with" id="pe6-6c-69g">
                                                                                         <integer key="representedObject" value="9"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is" id="Sc1-XK-Rfe">
+                                                                                    <menuItem title="is" id="7DS-Mb-EJI">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="QfB-K3-JvS">
+                                                                                    <menuItem title="is not" id="Asy-qk-Fry">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="matches" id="c5u-hj-Pj3">
+                                                                                    <menuItem title="matches" id="jAG-po-WAd">
                                                                                         <integer key="representedObject" value="6"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is like" id="PaO-c2-MPb">
+                                                                                    <menuItem title="is like" id="BXO-eV-tXu">
                                                                                         <integer key="representedObject" value="7"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="8yl-0k-g97">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="8Cr-XE-cu5">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">projects</string>
@@ -3753,43 +3768,43 @@
                                                                         <integer key="rightExpressionObject" value="700"/>
                                                                         <comparisonPredicateOptions key="options" caseInsensitive="YES" diacriticInsensitive="YES"/>
                                                                         <popUpMenus>
-                                                                            <menu id="tEQ-CK-LwO">
+                                                                            <menu id="bqa-tD-w9s">
                                                                                 <items>
-                                                                                    <menuItem title="projects" state="on" id="aBK-MM-62s">
+                                                                                    <menuItem title="projects" state="on" id="TEI-7S-rwr">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">projects</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="e8H-jF-B9p">
+                                                                            <menu id="E3z-Z1-wSf">
                                                                                 <items>
-                                                                                    <menuItem title="contains" state="on" id="l5u-lH-8Og">
+                                                                                    <menuItem title="contains" state="on" id="Y1I-Ie-g85">
                                                                                         <integer key="representedObject" value="99"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="begins with" id="yst-tR-Jka">
+                                                                                    <menuItem title="begins with" id="ZFB-dU-Zaw">
                                                                                         <integer key="representedObject" value="8"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="ends with" id="zRp-JP-1AD">
+                                                                                    <menuItem title="ends with" id="XnY-YZ-68o">
                                                                                         <integer key="representedObject" value="9"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is" id="vQM-Xu-r7b">
+                                                                                    <menuItem title="is" id="u3q-Uf-Ugi">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="VAD-Jn-r9n">
+                                                                                    <menuItem title="is not" id="zWa-S3-nlY">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="matches" id="oDW-KK-nDh">
+                                                                                    <menuItem title="matches" id="541-GE-xjv">
                                                                                         <integer key="representedObject" value="6"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is like" id="drd-zW-dsm">
+                                                                                    <menuItem title="is like" id="OeG-LD-F1K">
                                                                                         <integer key="representedObject" value="7"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="Rto-gM-aym">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="amF-bG-mpK">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">contexts</string>
@@ -3798,43 +3813,43 @@
                                                                         <integer key="rightExpressionObject" value="700"/>
                                                                         <comparisonPredicateOptions key="options" caseInsensitive="YES" diacriticInsensitive="YES"/>
                                                                         <popUpMenus>
-                                                                            <menu id="Jwt-bS-aLn">
+                                                                            <menu id="Dxj-g5-PhN">
                                                                                 <items>
-                                                                                    <menuItem title="contexts" state="on" id="EuI-T8-gkN">
+                                                                                    <menuItem title="contexts" state="on" id="n6W-Rd-KLE">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">contexts</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="9eh-mG-JiC">
+                                                                            <menu id="OZY-48-Tc4">
                                                                                 <items>
-                                                                                    <menuItem title="contains" state="on" id="qfe-VO-Usn">
+                                                                                    <menuItem title="contains" state="on" id="jb6-qy-iM4">
                                                                                         <integer key="representedObject" value="99"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="begins with" id="rp5-nX-ggy">
+                                                                                    <menuItem title="begins with" id="GAS-f0-IBr">
                                                                                         <integer key="representedObject" value="8"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="ends with" id="H8z-Wo-9VK">
+                                                                                    <menuItem title="ends with" id="LhX-fm-jNw">
                                                                                         <integer key="representedObject" value="9"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is" id="nPC-Db-EIy">
+                                                                                    <menuItem title="is" id="LLw-00-TgA">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="oKe-8v-pR2">
+                                                                                    <menuItem title="is not" id="63a-So-itC">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="matches" id="yw0-bw-ens">
+                                                                                    <menuItem title="matches" id="FBw-1r-e4c">
                                                                                         <integer key="representedObject" value="6"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is like" id="tQd-DM-48U">
+                                                                                    <menuItem title="is like" id="tHs-Ul-3kh">
                                                                                         <integer key="representedObject" value="7"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="21Z-gw-5Jn">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="I3v-80-2Jp">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">priorityText</string>
@@ -3843,40 +3858,40 @@
                                                                         <integer key="rightExpressionObject" value="700"/>
                                                                         <comparisonPredicateOptions key="options" caseInsensitive="YES" diacriticInsensitive="YES"/>
                                                                         <popUpMenus>
-                                                                            <menu id="HnC-y8-eqS">
+                                                                            <menu id="FJp-8A-WZk">
                                                                                 <items>
-                                                                                    <menuItem title="priority" state="on" id="aa1-EL-lPF">
+                                                                                    <menuItem title="priority" state="on" id="CTW-eC-3lT">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">priorityText</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="c7J-GO-tHm">
+                                                                            <menu id="EB5-zH-q7d">
                                                                                 <items>
-                                                                                    <menuItem title="is" state="on" id="2bU-5z-6IY">
+                                                                                    <menuItem title="is" state="on" id="t59-nD-bK3">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="vMV-Aj-Dbd">
+                                                                                    <menuItem title="is not" id="eIN-6q-Mr7">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than" id="DcY-f8-Ckg">
+                                                                                    <menuItem title="is less than" id="DcH-BY-EAY">
                                                                                         <integer key="representedObject" value="0"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than" id="DLs-CM-tNd">
+                                                                                    <menuItem title="is greater than" id="hG9-Fz-r5x">
                                                                                         <integer key="representedObject" value="2"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than or equal to" id="3hD-mz-gDr">
+                                                                                    <menuItem title="is less than or equal to" id="OE8-H6-liB">
                                                                                         <integer key="representedObject" value="1"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than or equal to" id="wzI-Aj-q9K">
+                                                                                    <menuItem title="is greater than or equal to" id="DTs-GP-sVr">
                                                                                         <integer key="representedObject" value="3"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="Xhz-EJ-yoE" customClass="TTMPredicateEditorDateRowTemplate">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="m2J-iD-dV6" customClass="TTMPredicateEditorDateRowTemplate">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">dueDate</string>
@@ -3884,40 +3899,40 @@
                                                                         </array>
                                                                         <integer key="rightExpressionObject" value="900"/>
                                                                         <popUpMenus>
-                                                                            <menu id="F8P-J2-uH3">
+                                                                            <menu id="bct-rB-GgA">
                                                                                 <items>
-                                                                                    <menuItem title="due date" state="on" id="UyI-Gx-Jfo">
+                                                                                    <menuItem title="due date" state="on" id="rik-3c-H73">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">dueDate</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="FpI-9a-5gS">
+                                                                            <menu id="B65-OI-cza">
                                                                                 <items>
-                                                                                    <menuItem title="is" state="on" id="ksY-vh-esR">
+                                                                                    <menuItem title="is" state="on" id="9S5-bt-aNc">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="EDx-iJ-lpk">
+                                                                                    <menuItem title="is not" id="ve8-nS-5ry">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than" id="hxR-Pr-9C7">
+                                                                                    <menuItem title="is less than" id="uVp-Hn-yDN">
                                                                                         <integer key="representedObject" value="0"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than" id="RxM-k8-O5U">
+                                                                                    <menuItem title="is greater than" id="a8K-Fr-Rik">
                                                                                         <integer key="representedObject" value="2"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than or equal to" id="DuP-45-ofg">
+                                                                                    <menuItem title="is less than or equal to" id="vXb-bh-dyK">
                                                                                         <integer key="representedObject" value="1"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than or equal to" id="9Iu-fY-4h4">
+                                                                                    <menuItem title="is greater than or equal to" id="EFg-XC-x3X">
                                                                                         <integer key="representedObject" value="3"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="AS3-bb-TIp" customClass="TTMPredicateEditorDateRowTemplate">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="r4p-Iv-8P1" customClass="TTMPredicateEditorDateRowTemplate">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">completionDate</string>
@@ -3925,40 +3940,40 @@
                                                                         </array>
                                                                         <integer key="rightExpressionObject" value="900"/>
                                                                         <popUpMenus>
-                                                                            <menu id="BfA-CZ-h1o">
+                                                                            <menu id="gDc-fK-uve">
                                                                                 <items>
-                                                                                    <menuItem title="completion date" state="on" id="OMI-Si-Uxa">
+                                                                                    <menuItem title="completion date" state="on" id="Bok-uF-6fn">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">completionDate</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="6qg-CY-CXG">
+                                                                            <menu id="RcE-wF-bqh">
                                                                                 <items>
-                                                                                    <menuItem title="is" state="on" id="zKl-d5-EIu">
+                                                                                    <menuItem title="is" state="on" id="ZFB-O6-tOi">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="Nqk-ZP-w8F">
+                                                                                    <menuItem title="is not" id="t0y-gm-bbb">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than" id="ob9-8T-bsG">
+                                                                                    <menuItem title="is less than" id="z33-SM-Q1C">
                                                                                         <integer key="representedObject" value="0"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than" id="pDC-TC-HR8">
+                                                                                    <menuItem title="is greater than" id="ie5-Xn-z9l">
                                                                                         <integer key="representedObject" value="2"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than or equal to" id="aG4-zo-3ml">
+                                                                                    <menuItem title="is less than or equal to" id="DgE-ab-GhY">
                                                                                         <integer key="representedObject" value="1"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than or equal to" id="kqk-FO-a83">
+                                                                                    <menuItem title="is greater than or equal to" id="mHu-9w-Mmg">
                                                                                         <integer key="representedObject" value="3"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="Bf0-U1-DFP" customClass="TTMPredicateEditorDateRowTemplate">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="e9t-vS-3rF" customClass="TTMPredicateEditorDateRowTemplate">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">creationDate</string>
@@ -3966,40 +3981,40 @@
                                                                         </array>
                                                                         <integer key="rightExpressionObject" value="900"/>
                                                                         <popUpMenus>
-                                                                            <menu id="hoy-Kb-s1Q">
+                                                                            <menu id="ng6-Ak-mXJ">
                                                                                 <items>
-                                                                                    <menuItem title="creation date" state="on" id="HAY-Si-EDJ">
+                                                                                    <menuItem title="creation date" state="on" id="RWy-Og-Nri">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">creationDate</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="7iK-AF-VQy">
+                                                                            <menu id="gVm-ge-Cqg">
                                                                                 <items>
-                                                                                    <menuItem title="is" state="on" id="CmT-kV-ALM">
+                                                                                    <menuItem title="is" state="on" id="RSW-tT-Kzj">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="p7w-1M-jN4">
+                                                                                    <menuItem title="is not" id="sZA-ra-GNC">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than" id="CeX-RT-ddv">
+                                                                                    <menuItem title="is less than" id="rMu-Ow-JBQ">
                                                                                         <integer key="representedObject" value="0"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than" id="g1k-Bk-F3Y">
+                                                                                    <menuItem title="is greater than" id="Xys-b7-n7P">
                                                                                         <integer key="representedObject" value="2"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than or equal to" id="erN-zf-r8k">
+                                                                                    <menuItem title="is less than or equal to" id="mgj-7X-2Cq">
                                                                                         <integer key="representedObject" value="1"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than or equal to" id="Lgn-tc-doz">
+                                                                                    <menuItem title="is greater than or equal to" id="17w-cw-g36">
                                                                                         <integer key="representedObject" value="3"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="VIN-DX-jgd" customClass="TTMPredicateEditorDateRowTemplate">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="cW5-7K-12d" customClass="TTMPredicateEditorDateRowTemplate">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">thresholdDate</string>
@@ -4007,40 +4022,40 @@
                                                                         </array>
                                                                         <integer key="rightExpressionObject" value="900"/>
                                                                         <popUpMenus>
-                                                                            <menu id="cRy-io-o3D">
+                                                                            <menu id="D7A-NV-zrx">
                                                                                 <items>
-                                                                                    <menuItem title="threshold date" state="on" id="Bm0-PI-VvG">
+                                                                                    <menuItem title="threshold date" state="on" id="8Ki-ce-F21">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">thresholdDate</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="yM4-GF-UhM">
+                                                                            <menu id="BrB-on-THX">
                                                                                 <items>
-                                                                                    <menuItem title="is" state="on" id="dGy-RT-5G5">
+                                                                                    <menuItem title="is" state="on" id="AKk-xg-ADD">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="3Q6-54-I3x">
+                                                                                    <menuItem title="is not" id="jC7-0H-f8b">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than" id="Waq-RR-9Tf">
+                                                                                    <menuItem title="is less than" id="B4R-WM-PLx">
                                                                                         <integer key="representedObject" value="0"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than" id="g6M-Ed-xau">
+                                                                                    <menuItem title="is greater than" id="mKv-BR-0VJ">
                                                                                         <integer key="representedObject" value="2"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than or equal to" id="Uaq-Tf-S8P">
+                                                                                    <menuItem title="is less than or equal to" id="CfA-4b-Ms3">
                                                                                         <integer key="representedObject" value="1"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than or equal to" id="0W0-5e-iUI">
+                                                                                    <menuItem title="is greater than or equal to" id="Hyb-H4-FIM">
                                                                                         <integer key="representedObject" value="3"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="NHy-mp-SxE" customClass="TTMPredicateEditorCompletedRowTemplate">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="5Dp-jX-JzG" customClass="TTMPredicateEditorCompletedRowTemplate">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">completed</string>
@@ -4048,25 +4063,25 @@
                                                                         </array>
                                                                         <integer key="rightExpressionObject" value="300"/>
                                                                         <popUpMenus>
-                                                                            <menu id="iKA-ug-Noq">
+                                                                            <menu id="5nh-J6-3q0">
                                                                                 <items>
-                                                                                    <menuItem title="completed" state="on" id="4xC-fb-P5D">
+                                                                                    <menuItem title="completed" state="on" id="OjS-ZX-zNK">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">completed</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="XZn-BG-Fpz">
+                                                                            <menu id="n4p-3Z-clL">
                                                                                 <items>
-                                                                                    <menuItem title="is" state="on" id="RE2-yD-ebX">
+                                                                                    <menuItem title="is" state="on" id="cc9-gY-ASd">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="Kkt-bH-FHq" customClass="TTMPredicateEditorDueRowTemplate">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="7i7-n4-q01" customClass="TTMPredicateEditorDueRowTemplate">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">dueState</string>
@@ -4074,28 +4089,28 @@
                                                                         </array>
                                                                         <integer key="rightExpressionObject" value="300"/>
                                                                         <popUpMenus>
-                                                                            <menu id="JNS-fV-AfC">
+                                                                            <menu id="0M6-Hk-i6R">
                                                                                 <items>
-                                                                                    <menuItem title="dueState" state="on" id="4PD-Z2-IFu">
+                                                                                    <menuItem title="dueState" state="on" id="jL7-Dw-BJq">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">dueState</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="y8G-hr-aP3">
+                                                                            <menu id="VLg-lX-yit">
                                                                                 <items>
-                                                                                    <menuItem title="is" state="on" id="gkL-g1-jLL">
+                                                                                    <menuItem title="is" state="on" id="Oy6-hU-KOZ">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="uoP-WY-6OV">
+                                                                                    <menuItem title="is not" id="Tev-jZ-woe">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="w1e-fW-wqt" customClass="TTMPredicateEditorThresholdRowTemplate">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="MFg-OS-fh5" customClass="TTMPredicateEditorThresholdRowTemplate">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">thresholdState</string>
@@ -4103,28 +4118,28 @@
                                                                         </array>
                                                                         <integer key="rightExpressionObject" value="300"/>
                                                                         <popUpMenus>
-                                                                            <menu id="ueh-9F-YlP">
+                                                                            <menu id="EtR-4I-n8l">
                                                                                 <items>
-                                                                                    <menuItem title="thresholdState" state="on" id="Yeh-cf-OsY">
+                                                                                    <menuItem title="thresholdState" state="on" id="FYh-7H-g2E">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">thresholdState</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="j9f-9t-a0e">
+                                                                            <menu id="SHT-zj-baD">
                                                                                 <items>
-                                                                                    <menuItem title="is" state="on" id="ktE-7t-umr">
+                                                                                    <menuItem title="is" state="on" id="246-fr-RJc">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="oog-PM-cXw">
+                                                                                    <menuItem title="is not" id="vbv-cI-ojd">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="CsE-Tc-St4" customClass="TTMPredicateEditorHiddenRowTemplate">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="Gb5-Mr-SJm" customClass="TTMPredicateEditorHiddenRowTemplate">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">isHidden</string>
@@ -4132,18 +4147,18 @@
                                                                         </array>
                                                                         <integer key="rightExpressionObject" value="700"/>
                                                                         <popUpMenus>
-                                                                            <menu id="mkl-hM-Ll0">
+                                                                            <menu id="qmv-cA-dyJ">
                                                                                 <items>
-                                                                                    <menuItem title="isHidden" state="on" id="sYP-Og-J7y">
+                                                                                    <menuItem title="isHidden" state="on" id="uq6-EP-SGr">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">isHidden</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="kss-96-8xa">
+                                                                            <menu id="Uw4-OV-4FP">
                                                                                 <items>
-                                                                                    <menuItem title="is" state="on" id="XyH-Ed-NKp">
+                                                                                    <menuItem title="is" state="on" id="g9k-O0-FPH">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
                                                                                 </items>
@@ -4152,7 +4167,7 @@
                                                                     </predicateEditorRowTemplate>
                                                                 </rowTemplates>
                                                                 <connections>
-                                                                    <binding destination="VIO-0n-UUv" name="value" keyPath="values.filterPredicate8" id="ydF-u1-heh">
+                                                                    <binding destination="VIO-0n-UUv" name="value" keyPath="values.filterPredicate8" id="uxK-k7-Sag">
                                                                         <dictionary key="options">
                                                                             <string key="NSValueTransformerName">NSKeyedUnarchiveFromData</string>
                                                                         </dictionary>
@@ -4162,22 +4177,16 @@
                                                         </subviews>
                                                         <color key="backgroundColor" white="0.91000002619999998" alpha="1" colorSpace="calibratedWhite"/>
                                                     </clipView>
-                                                    <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="ggy-sl-dIu">
+                                                    <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="euF-ZX-aAu">
                                                         <rect key="frame" x="-100" y="-100" width="360" height="15"/>
                                                         <autoresizingMask key="autoresizingMask"/>
                                                     </scroller>
-                                                    <scroller key="verticalScroller" verticalHuggingPriority="750" horizontal="NO" id="h5H-Ye-21u">
-                                                        <rect key="frame" x="477" y="1" width="15" height="258"/>
+                                                    <scroller key="verticalScroller" verticalHuggingPriority="750" horizontal="NO" id="h5A-de-bpk">
+                                                        <rect key="frame" x="477" y="1" width="15" height="256"/>
                                                         <autoresizingMask key="autoresizingMask"/>
                                                     </scroller>
                                                 </scrollView>
                                             </subviews>
-                                            <constraints>
-                                                <constraint firstAttribute="bottom" secondItem="e2Z-r8-sHg" secondAttribute="bottom" constant="17" id="2Bt-st-68Y"/>
-                                                <constraint firstAttribute="trailing" secondItem="e2Z-r8-sHg" secondAttribute="trailing" constant="17" id="7Ky-V3-1gj"/>
-                                                <constraint firstItem="e2Z-r8-sHg" firstAttribute="top" secondItem="GUo-xp-z9j" secondAttribute="top" constant="3" id="Acg-1p-yih"/>
-                                                <constraint firstItem="e2Z-r8-sHg" firstAttribute="leading" secondItem="GUo-xp-z9j" secondAttribute="leading" constant="17" id="aVH-QP-wdd"/>
-                                            </constraints>
                                         </view>
                                     </tabViewItem>
                                     <tabViewItem label="9" identifier="9" id="vBz-pp-fch">
@@ -4185,39 +4194,39 @@
                                             <rect key="frame" x="10" y="33" width="527" height="278"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             <subviews>
-                                                <scrollView autohidesScrollers="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BPh-yy-JhP">
+                                                <scrollView fixedFrame="YES" autohidesScrollers="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3kQ-Rh-zeA">
                                                     <rect key="frame" x="17" y="17" width="493" height="258"/>
-                                                    <clipView key="contentView" id="f1j-8H-LvM">
-                                                        <rect key="frame" x="1" y="1" width="491" height="256"/>
+                                                    <clipView key="contentView" ambiguous="YES" id="ize-3o-lW9">
+                                                        <rect key="frame" x="1" y="1" width="476" height="256"/>
                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                         <subviews>
-                                                            <predicateEditor verticalHuggingPriority="750" nestingMode="compound" rowHeight="25" id="XsA-Sd-hjN">
-                                                                <rect key="frame" x="0.0" y="0.0" width="491" height="325"/>
+                                                            <predicateEditor verticalHuggingPriority="750" ambiguous="YES" nestingMode="compound" rowHeight="25" id="NNi-kU-L08" userLabel="Filter 9 Predicate Editor">
+                                                                <rect key="frame" x="0.0" y="0.0" width="476" height="325"/>
                                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                                                                 <rowTemplates>
-                                                                    <predicateEditorRowTemplate rowType="compound" id="1xb-nc-bj6">
+                                                                    <predicateEditorRowTemplate rowType="compound" id="6sb-nW-uj9">
                                                                         <popUpMenus>
-                                                                            <menu id="9Xq-8A-OeK">
+                                                                            <menu id="kgI-e8-t2H">
                                                                                 <items>
-                                                                                    <menuItem title="Any" state="on" id="A3J-l8-zGK">
+                                                                                    <menuItem title="Any" state="on" id="S0C-0x-HG7">
                                                                                         <integer key="representedObject" value="2"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="All" id="SDh-vt-99b">
+                                                                                    <menuItem title="All" id="Whb-OO-qgY">
                                                                                         <integer key="representedObject" value="1"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="None" id="NRS-Gl-0ZK">
+                                                                                    <menuItem title="None" id="Lz0-rb-i9I">
                                                                                         <integer key="representedObject" value="0"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="VzE-Ge-K5q">
+                                                                            <menu id="Qqk-WE-apt">
                                                                                 <items>
-                                                                                    <menuItem title="of the following are true" state="on" id="Ceg-rk-lHr"/>
+                                                                                    <menuItem title="of the following are true" state="on" id="f2g-Rn-4ZD"/>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="bkm-hZ-MX4">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="g0W-5d-U2Z" customClass="TTMPredicateEditorTextRowTemplate">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">rawText</string>
@@ -4226,43 +4235,46 @@
                                                                         <integer key="rightExpressionObject" value="700"/>
                                                                         <comparisonPredicateOptions key="options" caseInsensitive="YES" diacriticInsensitive="YES"/>
                                                                         <popUpMenus>
-                                                                            <menu id="6D1-BW-kvM">
+                                                                            <menu id="TWF-gC-Sw5">
                                                                                 <items>
-                                                                                    <menuItem title="task" state="on" id="q5O-5e-KT8">
+                                                                                    <menuItem title="task" state="on" id="kf8-bZ-lqf">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">rawText</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="l5c-4D-SVb">
+                                                                            <menu id="Yd9-h6-1b2">
                                                                                 <items>
-                                                                                    <menuItem title="contains" state="on" id="yKA-oT-cHP">
+                                                                                    <menuItem title="contains" state="on" id="Juw-kR-1Qz">
                                                                                         <integer key="representedObject" value="99"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="begins with" id="YAI-xR-IPe">
+                                                                                    <menuItem title="does not contain" id="zvR-fg-fmZ" userLabel="does not contain">
+                                                                                        <integer key="representedObject" value="10"/>
+                                                                                    </menuItem>
+                                                                                    <menuItem title="begins with" id="cs1-EF-N4r">
                                                                                         <integer key="representedObject" value="8"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="ends with" id="Mtm-vE-aYr">
+                                                                                    <menuItem title="ends with" id="JuQ-HX-jXe">
                                                                                         <integer key="representedObject" value="9"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is" id="0GO-bR-fD2">
+                                                                                    <menuItem title="is" id="Ezc-XK-VX2">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="Qa1-GS-IgO">
+                                                                                    <menuItem title="is not" id="rBZ-L9-pQf">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="matches" id="KL1-JA-pSm">
+                                                                                    <menuItem title="matches" id="UVT-C9-TtM">
                                                                                         <integer key="representedObject" value="6"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is like" id="VTT-ck-blf">
+                                                                                    <menuItem title="is like" id="JZr-vm-yBn">
                                                                                         <integer key="representedObject" value="7"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="T61-K9-qSu">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="vGb-6S-2WA">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">projects</string>
@@ -4271,43 +4283,43 @@
                                                                         <integer key="rightExpressionObject" value="700"/>
                                                                         <comparisonPredicateOptions key="options" caseInsensitive="YES" diacriticInsensitive="YES"/>
                                                                         <popUpMenus>
-                                                                            <menu id="HPt-YX-DLB">
+                                                                            <menu id="Fqy-rP-UI7">
                                                                                 <items>
-                                                                                    <menuItem title="projects" state="on" id="T3u-cB-yCK">
+                                                                                    <menuItem title="projects" state="on" id="s8F-yX-7Ff">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">projects</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="W0G-z4-dJ4">
+                                                                            <menu id="erJ-Zi-1vv">
                                                                                 <items>
-                                                                                    <menuItem title="contains" state="on" id="Qy6-ov-qpK">
+                                                                                    <menuItem title="contains" state="on" id="j4q-OH-IAk">
                                                                                         <integer key="representedObject" value="99"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="begins with" id="QPK-t1-P0k">
+                                                                                    <menuItem title="begins with" id="PYu-YW-qWH">
                                                                                         <integer key="representedObject" value="8"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="ends with" id="4iy-E1-Bod">
+                                                                                    <menuItem title="ends with" id="Qdd-EN-tyk">
                                                                                         <integer key="representedObject" value="9"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is" id="d2f-5L-6P0">
+                                                                                    <menuItem title="is" id="fae-JO-IQ3">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="L2y-Sz-HRq">
+                                                                                    <menuItem title="is not" id="Qh2-oz-AED">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="matches" id="s1i-99-aat">
+                                                                                    <menuItem title="matches" id="Z3w-zt-V8W">
                                                                                         <integer key="representedObject" value="6"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is like" id="Ohh-TU-ReT">
+                                                                                    <menuItem title="is like" id="sGW-xC-uNI">
                                                                                         <integer key="representedObject" value="7"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="E9u-ik-MtF">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="9Kb-s1-Y0r">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">contexts</string>
@@ -4316,43 +4328,43 @@
                                                                         <integer key="rightExpressionObject" value="700"/>
                                                                         <comparisonPredicateOptions key="options" caseInsensitive="YES" diacriticInsensitive="YES"/>
                                                                         <popUpMenus>
-                                                                            <menu id="K8b-mL-uAS">
+                                                                            <menu id="6rL-Gk-8Dj">
                                                                                 <items>
-                                                                                    <menuItem title="contexts" state="on" id="f93-K9-lik">
+                                                                                    <menuItem title="contexts" state="on" id="7Pg-p1-lUz">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">contexts</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="nZ1-33-wln">
+                                                                            <menu id="Hmt-4O-1uo">
                                                                                 <items>
-                                                                                    <menuItem title="contains" state="on" id="vpz-Np-aVg">
+                                                                                    <menuItem title="contains" state="on" id="WbF-AD-hqT">
                                                                                         <integer key="representedObject" value="99"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="begins with" id="J9x-UK-9i4">
+                                                                                    <menuItem title="begins with" id="k42-RG-bKM">
                                                                                         <integer key="representedObject" value="8"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="ends with" id="Cgl-pd-g9D">
+                                                                                    <menuItem title="ends with" id="kpP-MX-XQK">
                                                                                         <integer key="representedObject" value="9"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is" id="z6G-gz-sqn">
+                                                                                    <menuItem title="is" id="gXk-5S-8HC">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="M2d-19-gpB">
+                                                                                    <menuItem title="is not" id="C1E-dE-6wY">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="matches" id="kat-Qh-Q3a">
+                                                                                    <menuItem title="matches" id="eA0-fd-hnX">
                                                                                         <integer key="representedObject" value="6"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is like" id="muD-qF-f3Z">
+                                                                                    <menuItem title="is like" id="yHn-pL-K1U">
                                                                                         <integer key="representedObject" value="7"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="FzE-LE-n11">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="HPy-Tw-FXA">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">priorityText</string>
@@ -4361,40 +4373,40 @@
                                                                         <integer key="rightExpressionObject" value="700"/>
                                                                         <comparisonPredicateOptions key="options" caseInsensitive="YES" diacriticInsensitive="YES"/>
                                                                         <popUpMenus>
-                                                                            <menu id="RgJ-AO-4m5">
+                                                                            <menu id="JBA-hS-MKg">
                                                                                 <items>
-                                                                                    <menuItem title="priority" state="on" id="zR6-Rg-bJD">
+                                                                                    <menuItem title="priority" state="on" id="O5G-pR-3Oa">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">priorityText</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="7oF-ze-z8u">
+                                                                            <menu id="Rqb-r7-QrH">
                                                                                 <items>
-                                                                                    <menuItem title="is" state="on" id="DRF-M0-B3I">
+                                                                                    <menuItem title="is" state="on" id="sts-m2-oOj">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="cQR-dm-cLv">
+                                                                                    <menuItem title="is not" id="38D-wn-fHX">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than" id="W4D-PN-EEF">
+                                                                                    <menuItem title="is less than" id="Y5K-bi-x97">
                                                                                         <integer key="representedObject" value="0"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than" id="eHN-n5-J1n">
+                                                                                    <menuItem title="is greater than" id="Sut-ba-krn">
                                                                                         <integer key="representedObject" value="2"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than or equal to" id="LYZ-Ua-6FK">
+                                                                                    <menuItem title="is less than or equal to" id="xoz-5n-ocp">
                                                                                         <integer key="representedObject" value="1"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than or equal to" id="cuP-au-ff3">
+                                                                                    <menuItem title="is greater than or equal to" id="ceN-DN-DCI">
                                                                                         <integer key="representedObject" value="3"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="rG6-Uh-Brw" customClass="TTMPredicateEditorDateRowTemplate">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="OyV-vi-mh2" customClass="TTMPredicateEditorDateRowTemplate">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">dueDate</string>
@@ -4402,40 +4414,40 @@
                                                                         </array>
                                                                         <integer key="rightExpressionObject" value="900"/>
                                                                         <popUpMenus>
-                                                                            <menu id="ufM-gO-PYt">
+                                                                            <menu id="ABK-3F-k7b">
                                                                                 <items>
-                                                                                    <menuItem title="due date" state="on" id="LUW-dp-ze4">
+                                                                                    <menuItem title="due date" state="on" id="JNs-qQ-1dL">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">dueDate</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="lbH-Gw-gOY">
+                                                                            <menu id="PwS-yE-Y7w">
                                                                                 <items>
-                                                                                    <menuItem title="is" state="on" id="vxj-k3-qjs">
+                                                                                    <menuItem title="is" state="on" id="rSc-6N-qro">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="5D7-bM-jRB">
+                                                                                    <menuItem title="is not" id="qBE-5r-Wi9">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than" id="JrV-tG-AS1">
+                                                                                    <menuItem title="is less than" id="JOx-DS-1e9">
                                                                                         <integer key="representedObject" value="0"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than" id="eaY-Ue-rw2">
+                                                                                    <menuItem title="is greater than" id="XL3-mi-UaK">
                                                                                         <integer key="representedObject" value="2"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than or equal to" id="CRk-YF-ggZ">
+                                                                                    <menuItem title="is less than or equal to" id="nP3-JK-W1t">
                                                                                         <integer key="representedObject" value="1"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than or equal to" id="WLB-dr-Iej">
+                                                                                    <menuItem title="is greater than or equal to" id="Gpm-5r-f3W">
                                                                                         <integer key="representedObject" value="3"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="90d-ek-7GJ" customClass="TTMPredicateEditorDateRowTemplate">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="pCj-fA-9Ej" customClass="TTMPredicateEditorDateRowTemplate">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">completionDate</string>
@@ -4443,40 +4455,40 @@
                                                                         </array>
                                                                         <integer key="rightExpressionObject" value="900"/>
                                                                         <popUpMenus>
-                                                                            <menu id="jJ0-2s-0Sb">
+                                                                            <menu id="RLU-8h-d8g">
                                                                                 <items>
-                                                                                    <menuItem title="completion date" state="on" id="tyB-eq-VSv">
+                                                                                    <menuItem title="completion date" state="on" id="QmY-3c-vHh">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">completionDate</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="bsE-5Q-Fyr">
+                                                                            <menu id="kyw-dc-bVR">
                                                                                 <items>
-                                                                                    <menuItem title="is" state="on" id="iA9-aa-rw3">
+                                                                                    <menuItem title="is" state="on" id="Fms-Oh-Yy5">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="G60-1O-isd">
+                                                                                    <menuItem title="is not" id="ubH-in-894">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than" id="Hc9-dQ-Uon">
+                                                                                    <menuItem title="is less than" id="5zy-al-4DL">
                                                                                         <integer key="representedObject" value="0"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than" id="FDu-Ma-1je">
+                                                                                    <menuItem title="is greater than" id="mNF-Ba-YGP">
                                                                                         <integer key="representedObject" value="2"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than or equal to" id="zy3-yc-U1G">
+                                                                                    <menuItem title="is less than or equal to" id="znk-It-zQw">
                                                                                         <integer key="representedObject" value="1"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than or equal to" id="zCw-nC-I3t">
+                                                                                    <menuItem title="is greater than or equal to" id="X2C-6o-MQD">
                                                                                         <integer key="representedObject" value="3"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="Sch-Ux-RJM" customClass="TTMPredicateEditorDateRowTemplate">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="kjW-iv-Fkt" customClass="TTMPredicateEditorDateRowTemplate">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">creationDate</string>
@@ -4484,40 +4496,40 @@
                                                                         </array>
                                                                         <integer key="rightExpressionObject" value="900"/>
                                                                         <popUpMenus>
-                                                                            <menu id="vNJ-NU-jTE">
+                                                                            <menu id="fh5-NK-8L9">
                                                                                 <items>
-                                                                                    <menuItem title="creation date" state="on" id="WgT-tX-Pdu">
+                                                                                    <menuItem title="creation date" state="on" id="fiU-xT-CFF">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">creationDate</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="twC-so-Zfh">
+                                                                            <menu id="Zc8-dq-a8M">
                                                                                 <items>
-                                                                                    <menuItem title="is" state="on" id="cTz-QT-pEK">
+                                                                                    <menuItem title="is" state="on" id="L0H-Hb-kXi">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="rbV-10-CKh">
+                                                                                    <menuItem title="is not" id="SlP-zW-uq6">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than" id="DSq-xY-cm7">
+                                                                                    <menuItem title="is less than" id="8mt-0M-39n">
                                                                                         <integer key="representedObject" value="0"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than" id="DTO-0O-n43">
+                                                                                    <menuItem title="is greater than" id="omW-8Y-E7V">
                                                                                         <integer key="representedObject" value="2"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than or equal to" id="kQZ-h7-Z1l">
+                                                                                    <menuItem title="is less than or equal to" id="6wc-Do-dyE">
                                                                                         <integer key="representedObject" value="1"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than or equal to" id="S0x-z3-jlm">
+                                                                                    <menuItem title="is greater than or equal to" id="1hk-Ec-yj9">
                                                                                         <integer key="representedObject" value="3"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="F6S-mE-eqS" customClass="TTMPredicateEditorDateRowTemplate">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="WN0-jJ-CUI" customClass="TTMPredicateEditorDateRowTemplate">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">thresholdDate</string>
@@ -4525,40 +4537,40 @@
                                                                         </array>
                                                                         <integer key="rightExpressionObject" value="900"/>
                                                                         <popUpMenus>
-                                                                            <menu id="yOA-cX-UFL">
+                                                                            <menu id="RSF-Hm-YRU">
                                                                                 <items>
-                                                                                    <menuItem title="threshold date" state="on" id="anR-B4-YRq">
+                                                                                    <menuItem title="threshold date" state="on" id="1NM-FJ-i85">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">thresholdDate</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="BGi-SB-KZZ">
+                                                                            <menu id="cR9-AW-Sia">
                                                                                 <items>
-                                                                                    <menuItem title="is" state="on" id="uQD-Gh-bIt">
+                                                                                    <menuItem title="is" state="on" id="NYX-CP-7Jq">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="grx-i4-swz">
+                                                                                    <menuItem title="is not" id="VoL-5j-9ol">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than" id="Oqg-Ye-s38">
+                                                                                    <menuItem title="is less than" id="iDW-zR-R98">
                                                                                         <integer key="representedObject" value="0"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than" id="ftE-dg-Jgb">
+                                                                                    <menuItem title="is greater than" id="aLI-ld-Ved">
                                                                                         <integer key="representedObject" value="2"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is less than or equal to" id="05D-9y-4fn">
+                                                                                    <menuItem title="is less than or equal to" id="9x4-JT-4dy">
                                                                                         <integer key="representedObject" value="1"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is greater than or equal to" id="cDB-1v-bws">
+                                                                                    <menuItem title="is greater than or equal to" id="pdM-CZ-pUi">
                                                                                         <integer key="representedObject" value="3"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="Kmh-UY-TJ8" customClass="TTMPredicateEditorCompletedRowTemplate">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="qAL-XZ-eP3" customClass="TTMPredicateEditorCompletedRowTemplate">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">completed</string>
@@ -4566,25 +4578,25 @@
                                                                         </array>
                                                                         <integer key="rightExpressionObject" value="300"/>
                                                                         <popUpMenus>
-                                                                            <menu id="LsT-2k-2dj">
+                                                                            <menu id="Brg-8E-wXq">
                                                                                 <items>
-                                                                                    <menuItem title="completed" state="on" id="VN6-WM-SgG">
+                                                                                    <menuItem title="completed" state="on" id="P4G-fL-zdS">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">completed</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="FGk-sB-jFS">
+                                                                            <menu id="zd7-OJ-Min">
                                                                                 <items>
-                                                                                    <menuItem title="is" state="on" id="UuC-hH-Y2L">
+                                                                                    <menuItem title="is" state="on" id="ryk-jC-gk5">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="M2H-HY-Fwc" customClass="TTMPredicateEditorDueRowTemplate">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="yUj-7p-KWx" customClass="TTMPredicateEditorDueRowTemplate">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">dueState</string>
@@ -4592,28 +4604,28 @@
                                                                         </array>
                                                                         <integer key="rightExpressionObject" value="300"/>
                                                                         <popUpMenus>
-                                                                            <menu id="YOb-58-uPT">
+                                                                            <menu id="QT6-eA-mmw">
                                                                                 <items>
-                                                                                    <menuItem title="dueState" state="on" id="SUb-jH-29l">
+                                                                                    <menuItem title="dueState" state="on" id="3Jq-eU-LHe">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">dueState</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="dlB-1j-lCs">
+                                                                            <menu id="ruj-Lv-tRd">
                                                                                 <items>
-                                                                                    <menuItem title="is" state="on" id="dbq-ki-jpZ">
+                                                                                    <menuItem title="is" state="on" id="jjt-BZ-BCO">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="UDQ-Bb-jxf">
+                                                                                    <menuItem title="is not" id="bz3-FL-g5s">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="9s2-oT-Zid" customClass="TTMPredicateEditorThresholdRowTemplate">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="z8n-ZR-66w" customClass="TTMPredicateEditorThresholdRowTemplate">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">thresholdState</string>
@@ -4621,28 +4633,28 @@
                                                                         </array>
                                                                         <integer key="rightExpressionObject" value="300"/>
                                                                         <popUpMenus>
-                                                                            <menu id="iWC-1Y-lNm">
+                                                                            <menu id="rlW-uc-92B">
                                                                                 <items>
-                                                                                    <menuItem title="thresholdState" state="on" id="mmi-JX-Q5a">
+                                                                                    <menuItem title="thresholdState" state="on" id="JWq-Ty-kD6">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">thresholdState</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="VrZ-Vd-USK">
+                                                                            <menu id="vTJ-EH-Vb6">
                                                                                 <items>
-                                                                                    <menuItem title="is" state="on" id="gQA-pd-BLX">
+                                                                                    <menuItem title="is" state="on" id="2T7-7f-Div">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
-                                                                                    <menuItem title="is not" id="hEP-U5-Uka">
+                                                                                    <menuItem title="is not" id="343-HV-gHx">
                                                                                         <integer key="representedObject" value="5"/>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
                                                                         </popUpMenus>
                                                                     </predicateEditorRowTemplate>
-                                                                    <predicateEditorRowTemplate rowType="simple" id="mE2-BW-5Kp" customClass="TTMPredicateEditorHiddenRowTemplate">
+                                                                    <predicateEditorRowTemplate rowType="simple" id="Kjl-Yz-Ll6" customClass="TTMPredicateEditorHiddenRowTemplate">
                                                                         <array key="leftExpressionObject">
                                                                             <expression type="keyPath">
                                                                                 <string key="keyPath">isHidden</string>
@@ -4650,18 +4662,18 @@
                                                                         </array>
                                                                         <integer key="rightExpressionObject" value="700"/>
                                                                         <popUpMenus>
-                                                                            <menu id="wLY-7H-ZGF">
+                                                                            <menu id="JUJ-m0-xFv">
                                                                                 <items>
-                                                                                    <menuItem title="isHidden" state="on" id="ibV-xQ-uor">
+                                                                                    <menuItem title="isHidden" state="on" id="8r6-UF-DBd">
                                                                                         <expression key="representedObject" type="keyPath">
                                                                                             <string key="keyPath">isHidden</string>
                                                                                         </expression>
                                                                                     </menuItem>
                                                                                 </items>
                                                                             </menu>
-                                                                            <menu id="Rym-E7-dGi">
+                                                                            <menu id="LGF-Hx-UWX">
                                                                                 <items>
-                                                                                    <menuItem title="is" state="on" id="YTC-UN-FLC">
+                                                                                    <menuItem title="is" state="on" id="MEp-hL-bH0">
                                                                                         <integer key="representedObject" value="4"/>
                                                                                     </menuItem>
                                                                                 </items>
@@ -4670,7 +4682,7 @@
                                                                     </predicateEditorRowTemplate>
                                                                 </rowTemplates>
                                                                 <connections>
-                                                                    <binding destination="VIO-0n-UUv" name="value" keyPath="values.filterPredicate9" id="yYm-0Y-a5Q">
+                                                                    <binding destination="VIO-0n-UUv" name="value" keyPath="values.filterPredicate9" id="hmm-Zl-Ca9">
                                                                         <dictionary key="options">
                                                                             <string key="NSValueTransformerName">NSKeyedUnarchiveFromData</string>
                                                                         </dictionary>
@@ -4680,22 +4692,16 @@
                                                         </subviews>
                                                         <color key="backgroundColor" white="0.91000002619999998" alpha="1" colorSpace="calibratedWhite"/>
                                                     </clipView>
-                                                    <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="pCR-LV-gCD">
+                                                    <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="ozp-n8-cJz">
                                                         <rect key="frame" x="-100" y="-100" width="360" height="15"/>
                                                         <autoresizingMask key="autoresizingMask"/>
                                                     </scroller>
-                                                    <scroller key="verticalScroller" verticalHuggingPriority="750" horizontal="NO" id="uW2-e6-tfL">
+                                                    <scroller key="verticalScroller" verticalHuggingPriority="750" horizontal="NO" id="N2B-Ta-yKU">
                                                         <rect key="frame" x="477" y="1" width="15" height="256"/>
                                                         <autoresizingMask key="autoresizingMask"/>
                                                     </scroller>
                                                 </scrollView>
                                             </subviews>
-                                            <constraints>
-                                                <constraint firstItem="BPh-yy-JhP" firstAttribute="top" secondItem="uF4-dA-lpm" secondAttribute="top" constant="3" id="6Ce-cp-hK0"/>
-                                                <constraint firstAttribute="bottom" secondItem="BPh-yy-JhP" secondAttribute="bottom" constant="17" id="8NA-hy-mEe"/>
-                                                <constraint firstItem="BPh-yy-JhP" firstAttribute="leading" secondItem="uF4-dA-lpm" secondAttribute="leading" constant="17" id="HAn-9a-cnD"/>
-                                                <constraint firstAttribute="trailing" secondItem="BPh-yy-JhP" secondAttribute="trailing" constant="17" id="L4n-FK-4gF"/>
-                                            </constraints>
                                         </view>
                                     </tabViewItem>
                                 </tabViewItems>
diff --git a/TodoTxtMac/TTMPredicateEditorTextRowTemplate.h b/TodoTxtMac/TTMPredicateEditorTextRowTemplate.h
new file mode 100644
index 0000000..ceaf00e
--- /dev/null
+++ b/TodoTxtMac/TTMPredicateEditorTextRowTemplate.h
@@ -0,0 +1,51 @@
+/**
+ * @author Michael Descy
+ * @copyright 2014-2016 Michael Descy
+ * @discussion Dual-licensed under the GNU General Public License and the MIT License
+ *
+ *
+ *
+ * @license GNU General Public License http://www.gnu.org/licenses/gpl.html
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ *
+ *
+ * @license The MIT License (MIT)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#import <Cocoa/Cocoa.h>
+
+@interface TTMPredicateEditorTextRowTemplate : NSPredicateEditorRowTemplate
+
+@end
diff --git a/TodoTxtMac/TTMPredicateEditorTextRowTemplate.m b/TodoTxtMac/TTMPredicateEditorTextRowTemplate.m
new file mode 100644
index 0000000..aadecc7
--- /dev/null
+++ b/TodoTxtMac/TTMPredicateEditorTextRowTemplate.m
@@ -0,0 +1,90 @@
+/**
+ * @author Michael Descy
+ * @copyright 2014-2016 Michael Descy
+ * @discussion Dual-licensed under the GNU General Public License and the MIT License
+ *
+ *
+ *
+ * @license GNU General Public License http://www.gnu.org/licenses/gpl.html
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ *
+ *
+ * @license The MIT License (MIT)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#import "TTMPredicateEditorTextRowTemplate.h"
+
+@implementation TTMPredicateEditorTextRowTemplate
+
+NSString *const inFormatPrefix = @"rawText IN[cd]";
+NSString *const notContainsFormatPrefix = @"NOT rawText CONTAINS[cd]";
+
+#pragma mark - NSPredicateEditorRowTemplate Method Overrides
+
+- (double)matchForPredicate:(NSPredicate *)predicate {
+    if ([predicate.predicateFormat hasPrefix:notContainsFormatPrefix]) {
+        return 0.4;
+    }
+    return [super matchForPredicate:predicate];
+}
+
+- (void)setPredicate:(NSPredicate*)predicate {
+    if ([predicate.predicateFormat hasPrefix:notContainsFormatPrefix]) {
+        NSPredicate *newPredicate = [self swapPredicateFormatPrefix:notContainsFormatPrefix withPrefix:inFormatPrefix forPredicate:predicate];
+        [super setPredicate:newPredicate];
+        return;
+    }
+
+    [super setPredicate:predicate];
+}
+
+- (NSPredicate*)predicateWithSubpredicates:(NSArray*)subpredicates {
+    NSPredicate *predicate = [super predicateWithSubpredicates:subpredicates];
+    return [self swapPredicateFormatPrefix:inFormatPrefix withPrefix:notContainsFormatPrefix forPredicate:predicate];
+}
+
+- (NSPredicate*)swapPredicateFormatPrefix:(NSString*)oldPrefix withPrefix:(NSString*)newPrefix forPredicate:(NSPredicate*)predicate {
+    NSString *predicateFormat = predicate.predicateFormat;
+    if ([predicateFormat hasPrefix:oldPrefix]) {
+        NSRange oldPrefixRange = [predicateFormat rangeOfString:oldPrefix];
+        NSString *newFormat = [predicateFormat stringByReplacingOccurrencesOfString:oldPrefix withString:newPrefix options:0 range:oldPrefixRange];
+        NSPredicate *newPredicate = [NSPredicate predicateWithFormat:newFormat];
+        return newPredicate;
+    }
+
+    return predicate;
+}
+
+@end

From b07ee73e736b154695ece196f99b9cb9163c4c83 Mon Sep 17 00:00:00 2001
From: Michael Descy <mjdescy@gmail.com>
Date: Wed, 10 Aug 2016 20:49:33 -0400
Subject: [PATCH 08/11] Made further adjustments to Preferences window layout
 to fix layout bugs on Behavior tab.

---
 TodoTxtMac/TTMPreferences.xib | 59 +++++++++++++++++++----------------
 1 file changed, 32 insertions(+), 27 deletions(-)

diff --git a/TodoTxtMac/TTMPreferences.xib b/TodoTxtMac/TTMPreferences.xib
index 3e53089..50a8cb8 100644
--- a/TodoTxtMac/TTMPreferences.xib
+++ b/TodoTxtMac/TTMPreferences.xib
@@ -20,32 +20,32 @@
         <window title="Preferences" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" frameAutosaveName="TTMPreferences" animationBehavior="default" id="QvC-M9-y7g">
             <windowStyleMask key="styleMask" titled="YES" closable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
-            <rect key="contentRect" x="196" y="240" width="630" height="468"/>
+            <rect key="contentRect" x="196" y="240" width="630" height="448"/>
             <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/>
             <view key="contentView" id="EiT-Mj-1SZ">
-                <rect key="frame" x="0.0" y="0.0" width="630" height="468"/>
+                <rect key="frame" x="0.0" y="0.0" width="630" height="448"/>
                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                 <subviews>
                     <tabView verticalCompressionResistancePriority="751" translatesAutoresizingMaskIntoConstraints="NO" id="y76-Kz-NYB">
-                        <rect key="frame" x="3" y="0.0" width="624" height="464"/>
+                        <rect key="frame" x="3" y="0.0" width="624" height="444"/>
                         <font key="font" metaFont="system"/>
                         <tabViewItems>
                             <tabViewItem label="Files" identifier="0" id="L8o-bt-LMa" userLabel="Files">
                                 <view key="view" id="kDW-tT-Mxi">
-                                    <rect key="frame" x="10" y="33" width="604" height="418"/>
+                                    <rect key="frame" x="10" y="33" width="604" height="420"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
                                         <stackView distribution="fillProportionally" orientation="vertical" alignment="leading" spacing="12" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="6Ky-Vz-equ">
-                                            <rect key="frame" x="10" y="10" width="584" height="398"/>
+                                            <rect key="frame" x="10" y="10" width="584" height="400"/>
                                             <subviews>
                                                 <box title="Default todo.txt file (optional)" borderType="line" translatesAutoresizingMaskIntoConstraints="NO" id="fTt-8Z-Eaa" userLabel="Default todo.txt file Box">
-                                                    <rect key="frame" x="7" y="201" width="570" height="197"/>
+                                                    <rect key="frame" x="7" y="202" width="570" height="198"/>
                                                     <view key="contentView" id="rip-cf-LYb">
-                                                        <rect key="frame" x="1" y="1" width="568" height="181"/>
+                                                        <rect key="frame" x="1" y="1" width="568" height="182"/>
                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                         <subviews>
                                                             <stackView distribution="fill" orientation="vertical" alignment="leading" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Xxd-gI-kIv">
-                                                                <rect key="frame" x="10" y="130" width="548" height="41"/>
+                                                                <rect key="frame" x="10" y="131" width="548" height="41"/>
                                                                 <subviews>
                                                                     <stackView orientation="horizontal" alignment="centerY" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="QEV-IA-Nkb" userLabel="Default File Stack View">
                                                                         <rect key="frame" x="0.0" y="22" width="548" height="19"/>
@@ -140,13 +140,13 @@
                                                     <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                                 </box>
                                                 <box title="Archive file (done.txt)" borderType="line" translatesAutoresizingMaskIntoConstraints="NO" id="BF2-7M-dnr" userLabel="Archive file (done.txt) Box">
-                                                    <rect key="frame" x="7" y="-4" width="570" height="197"/>
+                                                    <rect key="frame" x="7" y="-4" width="570" height="198"/>
                                                     <view key="contentView" id="WrR-WC-GsK">
-                                                        <rect key="frame" x="1" y="1" width="568" height="181"/>
+                                                        <rect key="frame" x="1" y="1" width="568" height="182"/>
                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                         <subviews>
                                                             <stackView distribution="fill" orientation="vertical" alignment="leading" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="sfr-8a-zUH">
-                                                                <rect key="frame" x="10" y="130" width="548" height="41"/>
+                                                                <rect key="frame" x="10" y="131" width="548" height="41"/>
                                                                 <subviews>
                                                                     <stackView orientation="horizontal" alignment="centerY" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="3oP-vL-K4R" userLabel="Archive File Stack View">
                                                                         <rect key="frame" x="0.0" y="22" width="548" height="19"/>
@@ -242,6 +242,7 @@
                                                 </box>
                                             </subviews>
                                             <constraints>
+                                                <constraint firstAttribute="height" constant="400" id="92h-kS-r74"/>
                                                 <constraint firstItem="fTt-8Z-Eaa" firstAttribute="leading" secondItem="6Ky-Vz-equ" secondAttribute="leading" constant="10" id="Lx3-WE-AIY"/>
                                                 <constraint firstItem="BF2-7M-dnr" firstAttribute="leading" secondItem="6Ky-Vz-equ" secondAttribute="leading" constant="10" id="UTF-Ev-hDL"/>
                                                 <constraint firstAttribute="trailing" secondItem="BF2-7M-dnr" secondAttribute="trailing" constant="10" id="UZC-iM-fsL"/>
@@ -267,20 +268,20 @@
                             </tabViewItem>
                             <tabViewItem label="Behavior" identifier="6" id="QYf-9f-Vd3" userLabel="Behavior">
                                 <view key="view" id="ADq-m3-TeV">
-                                    <rect key="frame" x="10" y="33" width="604" height="398"/>
+                                    <rect key="frame" x="10" y="33" width="604" height="420"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
                                         <stackView distribution="fillProportionally" orientation="vertical" alignment="leading" spacing="12" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="uWq-47-nKi">
-                                            <rect key="frame" x="10" y="10" width="584" height="378"/>
+                                            <rect key="frame" x="10" y="10" width="584" height="400"/>
                                             <subviews>
-                                                <box title="Application behaviors" borderType="line" translatesAutoresizingMaskIntoConstraints="NO" id="yed-2J-abW" userLabel="Application Behaviors Box">
-                                                    <rect key="frame" x="7" y="220" width="570" height="158"/>
+                                                <box verticalCompressionResistancePriority="756" title="Application behaviors" borderType="line" translatesAutoresizingMaskIntoConstraints="NO" id="yed-2J-abW" userLabel="Application Behaviors Box">
+                                                    <rect key="frame" x="7" y="220" width="570" height="180"/>
                                                     <view key="contentView" id="9wR-vg-DnJ">
-                                                        <rect key="frame" x="1" y="1" width="568" height="142"/>
+                                                        <rect key="frame" x="1" y="1" width="568" height="164"/>
                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                         <subviews>
                                                             <stackView distribution="fill" orientation="vertical" alignment="leading" spacing="12" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="shz-AI-b3R">
-                                                                <rect key="frame" x="10" y="-12" width="548" height="144"/>
+                                                                <rect key="frame" x="10" y="10" width="548" height="144"/>
                                                                 <subviews>
                                                                     <button verticalHuggingPriority="249" translatesAutoresizingMaskIntoConstraints="NO" id="jj2-Ob-EWZ">
                                                                         <rect key="frame" x="-2" y="128" width="246" height="18"/>
@@ -369,6 +370,9 @@
                                                             <constraint firstAttribute="trailing" secondItem="shz-AI-b3R" secondAttribute="trailing" constant="10" id="wtG-Rc-LaL"/>
                                                         </constraints>
                                                     </view>
+                                                    <constraints>
+                                                        <constraint firstAttribute="height" constant="176" id="PQQ-Nb-bWe"/>
+                                                    </constraints>
                                                     <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
                                                     <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                                 </box>
@@ -1216,20 +1220,20 @@
                             </tabViewItem>
                             <tabViewItem label="Status Bar" identifier="3" id="C0X-lJ-CYs">
                                 <view key="view" id="Xxm-Vu-L8l">
-                                    <rect key="frame" x="10" y="33" width="604" height="398"/>
+                                    <rect key="frame" x="10" y="33" width="604" height="420"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
                                         <box autoresizesSubviews="NO" title="Customize status bar" borderType="line" translatesAutoresizingMaskIntoConstraints="NO" id="uP8-O5-g7a" userLabel="Customize status bar Box">
-                                            <rect key="frame" x="7" y="164" width="590" height="224"/>
+                                            <rect key="frame" x="7" y="186" width="590" height="224"/>
                                             <view key="contentView" id="8uo-5X-lZk">
                                                 <rect key="frame" x="1" y="1" width="588" height="208"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
                                                     <stackView distribution="fill" orientation="vertical" alignment="leading" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="go8-tq-Ugi">
-                                                        <rect key="frame" x="10" y="38" width="568" height="160"/>
+                                                        <rect key="frame" x="10" y="-202" width="568" height="400"/>
                                                         <subviews>
                                                             <button translatesAutoresizingMaskIntoConstraints="NO" id="1w7-1m-yNC">
-                                                                <rect key="frame" x="-2" y="144" width="267" height="18"/>
+                                                                <rect key="frame" x="-2" y="384" width="267" height="18"/>
                                                                 <buttonCell key="cell" type="check" title="Show status bar on next opened window" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="5Dj-4D-p9M">
                                                                     <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                                                     <font key="font" metaFont="system"/>
@@ -1239,7 +1243,7 @@
                                                                 </connections>
                                                             </button>
                                                             <stackView distribution="fill" orientation="vertical" alignment="leading" spacing="0.0" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="VHN-SC-V7M">
-                                                                <rect key="frame" x="0.0" y="33" width="568" height="105"/>
+                                                                <rect key="frame" x="0.0" y="273" width="568" height="105"/>
                                                                 <subviews>
                                                                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="zXM-Pf-HPd">
                                                                         <rect key="frame" x="-2" y="88" width="47" height="17"/>
@@ -1284,10 +1288,10 @@
                                                                 </customSpacing>
                                                             </stackView>
                                                             <stackView distribution="fill" orientation="horizontal" alignment="firstBaseline" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="etk-f5-czz">
-                                                                <rect key="frame" x="0.0" y="0.0" width="568" height="25"/>
+                                                                <rect key="frame" x="0.0" y="0.0" width="568" height="265"/>
                                                                 <subviews>
                                                                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="VHD-8m-S6e">
-                                                                        <rect key="frame" x="-2" y="3" width="33" height="17"/>
+                                                                        <rect key="frame" x="-2" y="243" width="33" height="17"/>
                                                                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" title="Tags" id="Bau-Dg-GwY">
                                                                             <font key="font" metaFont="system"/>
                                                                             <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -1295,7 +1299,7 @@
                                                                         </textFieldCell>
                                                                     </textField>
                                                                     <popUpButton horizontalHuggingPriority="249" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="agZ-dD-T4T">
-                                                                        <rect key="frame" x="35" y="-3" width="295" height="26"/>
+                                                                        <rect key="frame" x="35" y="237" width="295" height="26"/>
                                                                         <popUpButtonCell key="cell" type="push" title="Available Tags" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" selectedItem="iPq-ql-2e0" id="1lf-Rh-gST">
                                                                             <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                                                                             <font key="font" metaFont="menu"/>
@@ -1313,7 +1317,7 @@
                                                                         </connections>
                                                                     </popUpButton>
                                                                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="JAg-G4-FBv">
-                                                                        <rect key="frame" x="329" y="-7" width="101" height="32"/>
+                                                                        <rect key="frame" x="329" y="233" width="101" height="32"/>
                                                                         <buttonCell key="cell" type="push" title="Insert Tag" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="TQZ-9N-nTD">
                                                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                                             <font key="font" metaFont="system"/>
@@ -1323,7 +1327,7 @@
                                                                         </connections>
                                                                     </button>
                                                                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="uhO-1z-q0Z">
-                                                                        <rect key="frame" x="426" y="-7" width="148" height="32"/>
+                                                                        <rect key="frame" x="426" y="233" width="148" height="32"/>
                                                                         <buttonCell key="cell" type="push" title="Reset to default..." bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="ngM-XH-2Xx">
                                                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                                             <font key="font" metaFont="system"/>
@@ -1352,6 +1356,7 @@
                                                             <constraint firstItem="etk-f5-czz" firstAttribute="leading" secondItem="go8-tq-Ugi" secondAttribute="leading" id="BNX-3u-YCx"/>
                                                             <constraint firstAttribute="trailing" secondItem="etk-f5-czz" secondAttribute="trailing" id="D4e-v4-8a7"/>
                                                             <constraint firstAttribute="trailing" secondItem="VHN-SC-V7M" secondAttribute="trailing" id="H2q-pb-4eZ"/>
+                                                            <constraint firstAttribute="height" constant="400" id="zS3-VR-Tz4"/>
                                                         </constraints>
                                                         <visibilityPriorities>
                                                             <integer value="1000"/>

From cac232267c4e8d2e2a156723d91f70c600b994bb Mon Sep 17 00:00:00 2001
From: Michael Descy <mjdescy@gmail.com>
Date: Wed, 10 Aug 2016 20:53:23 -0400
Subject: [PATCH 09/11] Bumped version number and build number.

---
 TodoTxtMac/TodoTxtMac-Info.plist | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/TodoTxtMac/TodoTxtMac-Info.plist b/TodoTxtMac/TodoTxtMac-Info.plist
index ccc54fd..d202449 100644
--- a/TodoTxtMac/TodoTxtMac-Info.plist
+++ b/TodoTxtMac/TodoTxtMac-Info.plist
@@ -38,11 +38,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.3.0</string>
+	<string>2.3.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2025</string>
+	<string>2026</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.productivity</string>
 	<key>LSMinimumSystemVersion</key>

From 4298691dd8a2f30b2b660368e7ca576704f97ca3 Mon Sep 17 00:00:00 2001
From: Michael Descy <mjdescy@gmail.com>
Date: Thu, 11 Aug 2016 10:56:38 -0400
Subject: [PATCH 10/11] Closes Issue #114: Pasting completed tasks into the
 task list appends creation dates in front of the "x".

---
 TodoTxtMac/TTMTask.m             | 5 +++--
 TodoTxtMac/TodoTxtMac-Info.plist | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/TodoTxtMac/TTMTask.m b/TodoTxtMac/TTMTask.m
index 1b915f9..eff9168 100644
--- a/TodoTxtMac/TTMTask.m
+++ b/TodoTxtMac/TTMTask.m
@@ -102,10 +102,11 @@ - (void)setRawText:(NSString*)rawText withPrependedDate:(NSDate*)prependedDate {
     
     if (!prependedDate ||
         [rawText isMatch:RX(CreationDatePatternIncomplete)] ||
-        [rawText isMatch:RX(CreationDatePatternCompleted)]
+        [rawText isMatch:RX(CreationDatePatternCompleted)] ||
+        [rawText isMatch:RX(CompletedPattern)]
         ) {
 
-        // if no prepended date is passed, or if there is already a creation date, prepend nothing
+        // if no prepended date is passed, or if there is already a creation date, or the task is already completed, prepend nothing
         newRawText = rawText;
     
     } else if ([rawText isMatch:RX(PriorityTextPattern)]) {
diff --git a/TodoTxtMac/TodoTxtMac-Info.plist b/TodoTxtMac/TodoTxtMac-Info.plist
index d202449..4fef59c 100644
--- a/TodoTxtMac/TodoTxtMac-Info.plist
+++ b/TodoTxtMac/TodoTxtMac-Info.plist
@@ -42,7 +42,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2026</string>
+	<string>2027</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.productivity</string>
 	<key>LSMinimumSystemVersion</key>

From 262883c8e5d24441fe366d61559f0b43c65d8897 Mon Sep 17 00:00:00 2001
From: Michael Descy <mjdescy@gmail.com>
Date: Thu, 11 Aug 2016 15:50:12 -0400
Subject: [PATCH 11/11] Closes Issue #91: ENH: horizontal scrolling for long
 items.

---
 TodoTxtMac/Base.lproj/TTMDocument.xib |  2 +-
 TodoTxtMac/TTMDocument.h              |  2 ++
 TodoTxtMac/TTMDocument.m              | 32 +++++++++++++++++++++++++--
 TodoTxtMac/TTMTableView.m             | 10 +++++++++
 TodoTxtMac/TodoTxtMac-Info.plist      |  2 +-
 5 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/TodoTxtMac/Base.lproj/TTMDocument.xib b/TodoTxtMac/Base.lproj/TTMDocument.xib
index 7e24949..d091270 100644
--- a/TodoTxtMac/Base.lproj/TTMDocument.xib
+++ b/TodoTxtMac/Base.lproj/TTMDocument.xib
@@ -53,7 +53,7 @@
                                                         <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                         <color key="backgroundColor" white="0.33333298560000002" alpha="1" colorSpace="calibratedWhite"/>
                                                     </tableHeaderCell>
-                                                    <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="left" title="Text Cell" id="B31-jc-X0I">
+                                                    <textFieldCell key="dataCell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" alignment="left" title="Text Cell" id="B31-jc-X0I">
                                                         <font key="font" metaFont="system"/>
                                                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                         <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
diff --git a/TodoTxtMac/TTMDocument.h b/TodoTxtMac/TTMDocument.h
index 5553e14..4a66455 100644
--- a/TodoTxtMac/TTMDocument.h
+++ b/TodoTxtMac/TTMDocument.h
@@ -550,4 +550,6 @@ typedef enum : NSUInteger {
  */
 - (IBAction)toggleStatusBarVisability:(id)sender;
 
+- (void)setTableWidthToWidthOfContents;
+
 @end
diff --git a/TodoTxtMac/TTMDocument.m b/TodoTxtMac/TTMDocument.m
index fda78b0..5acc927 100644
--- a/TodoTxtMac/TTMDocument.m
+++ b/TodoTxtMac/TTMDocument.m
@@ -98,7 +98,9 @@ - (void)awakeFromNib {
     [self.tableView registerForDraggedTypes:[NSArray arrayWithObject:NSStringPboardType]];
 
     [self setTaskListFont];
-    
+
+    [self setTableWidthToWidthOfContents];
+
     // Observe array controller selection to update "selected tasks" count in status bar
     [self.arrayController addObserver:self forKeyPath:@"selection" options:NSKeyValueObservingOptionNew context:nil];
     
@@ -533,7 +535,8 @@ - (void)refreshTaskListWithSave:(BOOL)saveToFile {
     [self.arrayController rearrangeObjects];
     // Reload table.
     [self.tableView reloadData];
-    
+    [self setTableWidthToWidthOfContents];
+
     // re-set selected items
     [self setTaskListSelections:taskListSelectedItemsList];
     
@@ -555,6 +558,7 @@ - (IBAction)visualRefreshOnly:(id)sender {
     [self setTaskListFont];
     [self reapplyActiveFilterPredicate];
     [self.tableView reloadData];
+    [self setTableWidthToWidthOfContents];
     [self updateTaskListMetadata];
 }
 
@@ -1561,4 +1565,28 @@ - (IBAction)toggleStatusBarVisability:(id)sender {
     [self setStatusBarVisable:!self.statusBarVisable];
 }
 
+// MARK - Column resizing methods
+
+- (void)setTableWidthToWidthOfContents {
+    CGFloat currentWidth = self.tableView.tableColumns.lastObject.width;
+    CGFloat tableContentWidth = [self tableViewContentWidth];
+    [self.tableView.tableColumns.lastObject setMinWidth:tableContentWidth];
+    if (currentWidth > tableContentWidth) {
+        [self.tableView.tableColumns.lastObject setWidth:tableContentWidth];
+    }
+}
+
+- (CGFloat)tableViewContentWidth {
+    NSTableView * tableView = self.tableView;
+    NSRect rect = NSMakeRect(0,0, INFINITY, tableView.rowHeight);
+    NSInteger columnIndex = 0;
+    CGFloat maxSize = 0;
+    for (NSInteger i = 0; i < tableView.numberOfRows; i++) {
+        NSCell *cell = [tableView preparedCellAtColumn:columnIndex row:i];
+        NSSize size = [cell cellSizeForBounds:rect];
+        maxSize = MAX(maxSize, size.width);
+    }
+    return maxSize;
+}
+
 @end
diff --git a/TodoTxtMac/TTMTableView.m b/TodoTxtMac/TTMTableView.m
index b236ea8..1ebe5a8 100644
--- a/TodoTxtMac/TTMTableView.m
+++ b/TodoTxtMac/TTMTableView.m
@@ -177,6 +177,15 @@ - (void)translateKeyDownEvent:(NSEvent*)theEvent
 
 #pragma mark - Respond to Changes Methods
 
+- (void)editColumn:(NSInteger)column row:(NSInteger)row withEvent:(NSEvent *)theEvent select:(BOOL)select {
+    [self.tableColumns.lastObject setMinWidth:0];
+    [self.tableColumns.lastObject setMaxWidth:self.parentDocument.windowForSheet.frame.size.width];
+    [self.tableColumns.lastObject setWidth:self.parentDocument.windowForSheet.frame.size.width];
+
+
+    [super editColumn:column row:row withEvent:theEvent select:select];
+}
+
 - (void)textDidBeginEditing:(NSNotification*)notification {
     [self.parentDocument initializeUpdateSelectedTask];
     [super textDidBeginEditing:notification];
@@ -190,6 +199,7 @@ - (void)textDidEndEditing:(NSNotification*)notification {
     // Handle no change.
     if (self.selectedRawText == nil ||
         [self.selectedRawText isEqualToString:newValue]) {
+        [self.parentDocument setTableWidthToWidthOfContents];
         return;
     }
     
diff --git a/TodoTxtMac/TodoTxtMac-Info.plist b/TodoTxtMac/TodoTxtMac-Info.plist
index 4fef59c..3eb7dc4 100644
--- a/TodoTxtMac/TodoTxtMac-Info.plist
+++ b/TodoTxtMac/TodoTxtMac-Info.plist
@@ -42,7 +42,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2027</string>
+	<string>2028</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.productivity</string>
 	<key>LSMinimumSystemVersion</key>