From 8424c161b93d296e6b58a0aaa72df140151eb8d3 Mon Sep 17 00:00:00 2001
From: relikd <info@relikd.de>
Date: Wed, 13 May 2020 01:37:50 +0200
Subject: [PATCH] Search + lastXMin Filter + dynamic text size

---
 AppCheck.xcodeproj/project.pbxproj            |   4 +
 main/AppDelegate.swift                        |   2 +-
 .../filter-clear.imageset/Contents.json       |  23 ++
 .../filter-clear.imageset/img.png             | Bin 0 -> 187 bytes
 .../filter-clear.imageset/img@2x.png          | Bin 0 -> 289 bytes
 .../filter-clear.imageset/img@3x.png          | Bin 0 -> 395 bytes
 .../filter-filled.imageset/Contents.json      |  23 ++
 .../filter-filled.imageset/img.png            | Bin 0 -> 155 bytes
 .../filter-filled.imageset/img@2x.png         | Bin 0 -> 226 bytes
 .../filter-filled.imageset/img@3x.png         | Bin 0 -> 302 bytes
 main/Base.lproj/Main.storyboard               | 284 +++++++++++++++---
 main/DB/DBWrapper.swift                       | 109 +++++--
 main/DB/SQDB.swift                            | 174 +++++------
 main/Extensions/AlertSheet.swift              |   4 +-
 main/Extensions/DBExtensions.swift            |   8 +
 main/Extensions/Generic.swift                 |  11 +
 main/Extensions/Notifications.swift           |   3 +-
 main/Extensions/SharedState.swift             |  33 ++
 main/Extensions/TableView.swift               | 140 +++++----
 main/Recordings/VCRecordings.swift            |   4 +-
 main/Requests/TVCDomains.swift                | 125 +++++++-
 main/Requests/VCDateFilter.swift              | 117 ++++++++
 main/Settings/TVCFilter.swift                 |   2 +-
 main/Settings/TVCSettings.swift               |   6 +-
 main/TBCMain.swift                            |   4 +-
 25 files changed, 865 insertions(+), 211 deletions(-)
 create mode 100644 main/Assets.xcassets/filter-clear.imageset/Contents.json
 create mode 100644 main/Assets.xcassets/filter-clear.imageset/img.png
 create mode 100644 main/Assets.xcassets/filter-clear.imageset/img@2x.png
 create mode 100644 main/Assets.xcassets/filter-clear.imageset/img@3x.png
 create mode 100644 main/Assets.xcassets/filter-filled.imageset/Contents.json
 create mode 100644 main/Assets.xcassets/filter-filled.imageset/img.png
 create mode 100644 main/Assets.xcassets/filter-filled.imageset/img@2x.png
 create mode 100644 main/Assets.xcassets/filter-filled.imageset/img@3x.png
 create mode 100644 main/Requests/VCDateFilter.swift

diff --git a/AppCheck.xcodeproj/project.pbxproj b/AppCheck.xcodeproj/project.pbxproj
index 64f804b..7f881f4 100644
--- a/AppCheck.xcodeproj/project.pbxproj
+++ b/AppCheck.xcodeproj/project.pbxproj
@@ -11,6 +11,7 @@
 		540E6780242D2CF100871BBE /* VCRecordings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 540E677F242D2CF100871BBE /* VCRecordings.swift */; };
 		540E67822433483D00871BBE /* VCEditRecording.swift in Sources */ = {isa = PBXBuildFile; fileRef = 540E67812433483D00871BBE /* VCEditRecording.swift */; };
 		540E67842433FAFE00871BBE /* TVCPreviousRecords.swift in Sources */ = {isa = PBXBuildFile; fileRef = 540E67832433FAFE00871BBE /* TVCPreviousRecords.swift */; };
+		5412F8EE24571B8200A63D7A /* VCDateFilter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5412F8ED24571B8100A63D7A /* VCDateFilter.swift */; };
 		541A957623E602DF00C09C19 /* LaunchIcon.png in Resources */ = {isa = PBXBuildFile; fileRef = 541A957523E602DF00C09C19 /* LaunchIcon.png */; };
 		541AC5D82399498A00A769D7 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 541AC5D72399498A00A769D7 /* AppDelegate.swift */; };
 		541AC5DD2399498A00A769D7 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 541AC5DB2399498A00A769D7 /* Main.storyboard */; };
@@ -154,6 +155,7 @@
 		540E677F242D2CF100871BBE /* VCRecordings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VCRecordings.swift; sourceTree = "<group>"; };
 		540E67812433483D00871BBE /* VCEditRecording.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VCEditRecording.swift; sourceTree = "<group>"; };
 		540E67832433FAFE00871BBE /* TVCPreviousRecords.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TVCPreviousRecords.swift; sourceTree = "<group>"; };
+		5412F8ED24571B8100A63D7A /* VCDateFilter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VCDateFilter.swift; sourceTree = "<group>"; };
 		541A957523E602DF00C09C19 /* LaunchIcon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = LaunchIcon.png; sourceTree = "<group>"; };
 		541AC5D42399498A00A769D7 /* AppCheck.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = AppCheck.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		541AC5D72399498A00A769D7 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
@@ -296,6 +298,7 @@
 			isa = PBXGroup;
 			children = (
 				54953E5E23DEBE840054345C /* TVCDomains.swift */,
+				5412F8ED24571B8100A63D7A /* VCDateFilter.swift */,
 				54953E6023E0D69A0054345C /* TVCHosts.swift */,
 				54953E6E23E44CD00054345C /* TVCHostDetails.swift */,
 			);
@@ -790,6 +793,7 @@
 				54C056DD23E9EEF700214A3F /* BundleIcon.swift in Sources */,
 				542E2A982404973F001462DC /* TBCMain.swift in Sources */,
 				5458EBC0243A3F2200CFEB15 /* TVCRecordingDetails.swift in Sources */,
+				5412F8EE24571B8200A63D7A /* VCDateFilter.swift in Sources */,
 				545DDDD124436983003B6544 /* QuickUI.swift in Sources */,
 				541AC5D82399498A00A769D7 /* AppDelegate.swift in Sources */,
 				54B345992414F491004C53CC /* DBWrapper.swift in Sources */,
diff --git a/main/AppDelegate.swift b/main/AppDelegate.swift
index a51e651..b904c17 100644
--- a/main/AppDelegate.swift
+++ b/main/AppDelegate.swift
@@ -23,7 +23,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 			self.postVPNState()
 		}
 		NSNotification.Name.NEVPNStatusDidChange.observe(call: #selector(vpnStatusChanged(_:)), on: self)
-		NotifyFilterChanged.observe(call: #selector(filterDidChange), on: self)
+		NotifyDNSFilterChanged.observe(call: #selector(filterDidChange), on: self)
 		return true
 	}
 	
diff --git a/main/Assets.xcassets/filter-clear.imageset/Contents.json b/main/Assets.xcassets/filter-clear.imageset/Contents.json
new file mode 100644
index 0000000..d9287fd
--- /dev/null
+++ b/main/Assets.xcassets/filter-clear.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "img.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "img@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "img@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/main/Assets.xcassets/filter-clear.imageset/img.png b/main/Assets.xcassets/filter-clear.imageset/img.png
new file mode 100644
index 0000000000000000000000000000000000000000..a6e03bbd85578263a9bcf6522c0aa652770aaac7
GIT binary patch
literal 187
zcmeAS@N?(olHy`uVBq!ia0y~yU=RUe4i*Lm2K9!kZ43+yO`a}}Ar-ftPH+@Fpuoct
z&LpJ8$mwxVP)KQ^(1ZX^kB*iv!CaRaZ`JFsPbr(Un<3@RQX__xmJJ%23m(llxlr_r
z#&HpwfSOz-H>o5}<!{WDeD7E{*=*eOB*07jRA8E7?e803W9_|fI4xcH+|Qb=VdLhI
q9S1*H8`Lq2F5a-W+2~dolc;9k;n^)G-5D4d7(8A5T-G@yGywoGc|xxM

literal 0
HcmV?d00001

diff --git a/main/Assets.xcassets/filter-clear.imageset/img@2x.png b/main/Assets.xcassets/filter-clear.imageset/img@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..157860f4cfded6e75a8e7331eb5a768050818365
GIT binary patch
literal 289
zcmeAS@N?(olHy`uVBq!ia0y~yV9)?z4i*Lm2DR@6&lngOUU<4VhE&{oJ1tP~hyssG
zxRdIf7Oxd8UJgt`1p%5KD_B%QoK)|eb?i^vF~#YS`sr}v!_6s*tUtUS-%ZSLnW^V6
znYlM%f<vdrf~3bGd@;2Tj+{Ak*5dCUQ{FaPxf!zxh5Ksi9j~>2PkZq0d1RKV`}&ZO
z6K5{YoVZov)y8kDPR_Z{*0nrYd#S^;jAZed*^k~DGW?!lJNt5t;HhUJGXwMewn}b&
zR*-+C*Yc0`{3}_V6J4)NU1X_OXPtPzN7VcGrdE$<{26Qo4D1CA!3%a(Rfs<*+Zt79
tekT6D*~@!Q4>+5}tvr6)$2iZDmlQS?GPTwyVqjok@O1TaS?83{1OP2QcyRy#

literal 0
HcmV?d00001

diff --git a/main/Assets.xcassets/filter-clear.imageset/img@3x.png b/main/Assets.xcassets/filter-clear.imageset/img@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..d34c2e149efdac80dfc46d8d2cb3d334571c111c
GIT binary patch
literal 395
zcmeAS@N?(olHy`uVBq!ia0y~yV6XvU4rY*ulBNR#1A}pZPlzi6>0mLd+eron2Emdb
zzhDN1_x~O4?{8RdFh4-xd_hA0;^2~I1_p+2o-U3d6}R3_KgidtAi&xvD!}sf|Nd<z
zlh(bIlgpm<<<Oi17EQ|HzK5-X9<SLM@q+R6`V@JQANrP3tRJU;S~c<d>^UCWOP079
z&GqTcy>fTOMElD@x34TUG~e4FqFZzD6RXS0nteMY-JLg9>82gO_+y`}?ZkuDPs%4Q
zFpCj9?)Bg|=ZDG;CAN;PMGqs4r21MH!zqhdJ*|rxBP>9ICnGGRx>^^XjA*{-HNS(+
zKq}v)D?<6=E7LVfVn@uMN^Na4w>lKd7d-FNl;wZyZ`w`oci>O0{&s)fnrSlw=AF`0
opL?>%w(FvBMWC(vPg%WROuU+WvX4U3BS3-b>FVdQ&MBb@0P#AHj{pDw

literal 0
HcmV?d00001

diff --git a/main/Assets.xcassets/filter-filled.imageset/Contents.json b/main/Assets.xcassets/filter-filled.imageset/Contents.json
new file mode 100644
index 0000000..d9287fd
--- /dev/null
+++ b/main/Assets.xcassets/filter-filled.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "img.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "img@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "img@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/main/Assets.xcassets/filter-filled.imageset/img.png b/main/Assets.xcassets/filter-filled.imageset/img.png
new file mode 100644
index 0000000000000000000000000000000000000000..ee3f69bc8f8f466c35997d65ef7177cb277500a4
GIT binary patch
literal 155
zcmeAS@N?(olHy`uVBq!ia0y~yU=RUe4i*Lm2K9!kZ43+yNuDl_Ar-gYo_FLupuppB
zQJ;}>asa2tK}n$r4J;}?OhVgEJBekS&fNYtE`FBSf}-4IO!FNU?p~v8qbjZzmpVCh
z*{oAi-i|xB2nS4J<#Ib&m$Z&2te~6unEb5|Pi`Dule?SICV7K!-MnjY3=9kmp00i_
I>zopr0KSSe#{d8T

literal 0
HcmV?d00001

diff --git a/main/Assets.xcassets/filter-filled.imageset/img@2x.png b/main/Assets.xcassets/filter-filled.imageset/img@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..c160362c397d17df66b4a973a48b0fcf5750cdc1
GIT binary patch
literal 226
zcmeAS@N?(olHy`uVBq!ia0y~yV9)?z4i*Lm2DR@6&lngOR(iTPhE&{od&N=ku!4x|
zMQujTsRAJ6;lRW<p@~Js#Ysg$@n-2ol>_bfLwCM8e_)R!!+}B#nd9o~nSSkO3l}Y5
zJ!@UHugf{+$)v>B&&+ttb)V?zZT>LfEt76*(+utqFD1Revm4BdfB%)(`&i`I3+dxZ
z8a@4r(&~!qO#B{8tbNRJEJOOZQ9#bmaFw6G_M0E%^ebqxXI!f$QQ6El<Kv!y6NM90
c&f73v(%hDlcQLe?fq{X+)78&qol`;+0Qq!PR{#J2

literal 0
HcmV?d00001

diff --git a/main/Assets.xcassets/filter-filled.imageset/img@3x.png b/main/Assets.xcassets/filter-filled.imageset/img@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..e6a61993de1531ce0785df7b9d42526f94b74000
GIT binary patch
literal 302
zcmeAS@N?(olHy`uVBq!ia0y~yV6XvU4i*Lmh6!H<e=;yIeD!p345_&Fc6uOhvw?ua
zd=?cSCZP!doRb?^WPF%}v=})(9GHY|9JiZxkZa1lyOW;AvF?faRCV%Tx3qEh!Pz@M
zIwmiQjmU_3lcZdjtF|uk;_QrSvyh%ww<dP!XXLLxdu@}~n#A@n-`hnFAs5~FE_Ub$
zUY!+Xv8nQRc`!?0p+d8t&+UnxTe`fIH%$)obe|?TH7BK!$!hnC6s2yFV%1IEfm7YW
z1VSTI7#*#4uUO|QCivVZ#VPQqo0>#uTneM>vL$6sQx!GkV%{W)@4j(VuWVy??4SLQ
z{+T~=eBO3L`23eDaThO}qU-ZYbj@acKHJ>dxvl1$x*)f3jQd}o4Gatn44$rjF6*2U
FngI6Jc(DKg

literal 0
HcmV?d00001

diff --git a/main/Base.lproj/Main.storyboard b/main/Base.lproj/Main.storyboard
index 644501c..a86b834 100644
--- a/main/Base.lproj/Main.storyboard
+++ b/main/Base.lproj/Main.storyboard
@@ -44,6 +44,196 @@
             </objects>
             <point key="canvasLocation" x="0.0" y="-1250"/>
         </scene>
+        <!--Date Filter-->
+        <scene sceneID="GqC-c0-bWe">
+            <objects>
+                <viewController storyboardIdentifier="domainFilter" modalTransitionStyle="crossDissolve" id="r7v-PM-PrR" customClass="VCDateFilter" customModule="AppCheck" customModuleProvider="target" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="QBv-5g-BTH">
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="320"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <navigationBar hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="jAM-LN-evh">
+                                <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
+                                <items>
+                                    <navigationItem title="Placeholder" id="s5o-aw-nIo">
+                                        <barButtonItem key="rightBarButtonItem" title="Item" image="filter-clear" id="oMW-R3-3Eh"/>
+                                    </navigationItem>
+                                </items>
+                            </navigationBar>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="pEc-vv-7Ts">
+                                <rect key="frame" x="78.5" y="64" width="233.5" height="217.5"/>
+                                <subviews>
+                                    <segmentedControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="0" translatesAutoresizingMaskIntoConstraints="NO" id="UNT-qn-2cg">
+                                        <rect key="frame" x="8" y="8" width="217.5" height="32"/>
+                                        <segments>
+                                            <segment title="Most recent"/>
+                                            <segment title="Date Range"/>
+                                        </segments>
+                                        <connections>
+                                            <action selector="didChangeSegment:" destination="r7v-PM-PrR" eventType="valueChanged" id="cxI-lR-J7y"/>
+                                        </connections>
+                                    </segmentedControl>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Show entries no older than" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="UBq-oH-pKp">
+                                        <rect key="frame" x="10" y="55" width="213.5" height="20.5"/>
+                                        <fontDescription key="fontDescription" style="UICTFontTextStyleHeadline"/>
+                                        <nil key="textColor"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                    <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="gEf-Ra-RyA">
+                                        <rect key="frame" x="10" y="83.5" width="213.5" height="124"/>
+                                        <subviews>
+                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ucF-MH-iRP">
+                                                <rect key="frame" x="0.0" y="0.0" width="213.5" height="50"/>
+                                                <subviews>
+                                                    <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="0.5" minValue="0.0" maxValue="1" translatesAutoresizingMaskIntoConstraints="NO" id="qhe-6d-hGB">
+                                                        <rect key="frame" x="-2" y="0.0" width="155.5" height="51"/>
+                                                        <connections>
+                                                            <action selector="durationSliderChanged:" destination="r7v-PM-PrR" eventType="valueChanged" id="nQB-w9-dY1"/>
+                                                        </connections>
+                                                    </slider>
+                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="7 days" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ika-su-PZQ">
+                                                        <rect key="frame" x="159.5" y="16" width="54" height="18"/>
+                                                        <constraints>
+                                                            <constraint firstAttribute="width" secondItem="ika-su-PZQ" secondAttribute="height" multiplier="3" id="o9m-cy-kkn"/>
+                                                        </constraints>
+                                                        <fontDescription key="fontDescription" style="UICTFontTextStyleSubhead"/>
+                                                        <nil key="textColor"/>
+                                                        <nil key="highlightedColor"/>
+                                                    </label>
+                                                </subviews>
+                                                <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                                                <constraints>
+                                                    <constraint firstItem="qhe-6d-hGB" firstAttribute="leading" secondItem="ucF-MH-iRP" secondAttribute="leading" id="EGU-ln-lJF"/>
+                                                    <constraint firstItem="ika-su-PZQ" firstAttribute="trailing" secondItem="ucF-MH-iRP" secondAttribute="trailing" id="KLs-Ft-wSo"/>
+                                                    <constraint firstItem="qhe-6d-hGB" firstAttribute="bottom" secondItem="ucF-MH-iRP" secondAttribute="bottom" id="PTR-Et-Klv"/>
+                                                    <constraint firstItem="ika-su-PZQ" firstAttribute="leading" secondItem="qhe-6d-hGB" secondAttribute="trailing" constant="8" symbolic="YES" id="aHy-IX-X4B"/>
+                                                    <constraint firstItem="ika-su-PZQ" firstAttribute="centerY" secondItem="qhe-6d-hGB" secondAttribute="centerY" id="cHs-5z-CHK"/>
+                                                    <constraint firstItem="qhe-6d-hGB" firstAttribute="top" secondItem="ucF-MH-iRP" secondAttribute="top" id="eJC-d4-zg0"/>
+                                                </constraints>
+                                            </view>
+                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="9As-hA-MKt">
+                                                <rect key="frame" x="0.0" y="50" width="213.5" height="74"/>
+                                                <subviews>
+                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="From:" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wAd-o2-PHY">
+                                                        <rect key="frame" x="0.0" y="6.5" width="44" height="20.5"/>
+                                                        <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
+                                                        <nil key="textColor"/>
+                                                        <nil key="highlightedColor"/>
+                                                    </label>
+                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="FVD-kB-91w">
+                                                        <rect key="frame" x="52" y="0.0" width="161.5" height="33"/>
+                                                        <fontDescription key="fontDescription" style="UICTFontTextStyleHeadline"/>
+                                                        <state key="normal" title="1970-01-01 01:00"/>
+                                                        <connections>
+                                                            <action selector="didTapRangeButton:" destination="r7v-PM-PrR" eventType="touchUpInside" id="g05-Sc-0P2"/>
+                                                        </connections>
+                                                    </button>
+                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="To:" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fzL-94-c0l">
+                                                        <rect key="frame" x="0.0" y="47.5" width="44" height="20.5"/>
+                                                        <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
+                                                        <nil key="textColor"/>
+                                                        <nil key="highlightedColor"/>
+                                                    </label>
+                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="IG3-Wc-UI4">
+                                                        <rect key="frame" x="52" y="41" width="161.5" height="33"/>
+                                                        <fontDescription key="fontDescription" style="UICTFontTextStyleHeadline"/>
+                                                        <state key="normal" title="1970-01-01 01:00"/>
+                                                        <connections>
+                                                            <action selector="didTapRangeButton:" destination="r7v-PM-PrR" eventType="touchUpInside" id="63v-sy-Bpo"/>
+                                                        </connections>
+                                                    </button>
+                                                </subviews>
+                                                <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                                                <constraints>
+                                                    <constraint firstItem="FVD-kB-91w" firstAttribute="top" secondItem="9As-hA-MKt" secondAttribute="top" id="J2e-NO-NUD"/>
+                                                    <constraint firstItem="IG3-Wc-UI4" firstAttribute="top" secondItem="FVD-kB-91w" secondAttribute="bottom" constant="8" symbolic="YES" id="Jyg-b6-5rH"/>
+                                                    <constraint firstItem="fzL-94-c0l" firstAttribute="centerY" secondItem="IG3-Wc-UI4" secondAttribute="centerY" id="LAG-jg-nBi"/>
+                                                    <constraint firstItem="wAd-o2-PHY" firstAttribute="trailing" secondItem="fzL-94-c0l" secondAttribute="trailing" id="Lav-7y-PUJ"/>
+                                                    <constraint firstItem="IG3-Wc-UI4" firstAttribute="trailing" secondItem="9As-hA-MKt" secondAttribute="trailing" id="XqI-1p-FNv"/>
+                                                    <constraint firstItem="FVD-kB-91w" firstAttribute="leading" secondItem="wAd-o2-PHY" secondAttribute="trailing" constant="8" symbolic="YES" id="YlE-w7-CZ5"/>
+                                                    <constraint firstItem="FVD-kB-91w" firstAttribute="trailing" secondItem="9As-hA-MKt" secondAttribute="trailing" id="a6D-1D-HvF"/>
+                                                    <constraint firstItem="wAd-o2-PHY" firstAttribute="leading" secondItem="fzL-94-c0l" secondAttribute="leading" id="bM0-gJ-IW5"/>
+                                                    <constraint firstItem="wAd-o2-PHY" firstAttribute="centerY" secondItem="FVD-kB-91w" secondAttribute="centerY" id="g7F-LP-PQQ"/>
+                                                    <constraint firstItem="IG3-Wc-UI4" firstAttribute="bottom" secondItem="9As-hA-MKt" secondAttribute="bottom" id="jlK-69-8hl"/>
+                                                    <constraint firstItem="IG3-Wc-UI4" firstAttribute="leading" secondItem="fzL-94-c0l" secondAttribute="trailing" constant="8" symbolic="YES" id="pcE-Gv-oj7"/>
+                                                    <constraint firstItem="wAd-o2-PHY" firstAttribute="leading" secondItem="9As-hA-MKt" secondAttribute="leading" id="zgR-pJ-vFs"/>
+                                                </constraints>
+                                            </view>
+                                        </subviews>
+                                    </stackView>
+                                </subviews>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                                <constraints>
+                                    <constraint firstItem="UNT-qn-2cg" firstAttribute="top" secondItem="pEc-vv-7Ts" secondAttribute="top" constant="8" id="Awu-uv-9wF"/>
+                                    <constraint firstItem="UBq-oH-pKp" firstAttribute="top" secondItem="UNT-qn-2cg" secondAttribute="bottom" constant="16" id="FDO-1V-ffl"/>
+                                    <constraint firstItem="UNT-qn-2cg" firstAttribute="leading" secondItem="pEc-vv-7Ts" secondAttribute="leading" constant="8" id="Icx-YR-5bc"/>
+                                    <constraint firstItem="UBq-oH-pKp" firstAttribute="leading" secondItem="pEc-vv-7Ts" secondAttribute="leading" constant="10" id="KRb-xo-A9i"/>
+                                    <constraint firstItem="gEf-Ra-RyA" firstAttribute="top" secondItem="UBq-oH-pKp" secondAttribute="bottom" constant="8" symbolic="YES" id="QPi-aa-6ff"/>
+                                    <constraint firstItem="UNT-qn-2cg" firstAttribute="trailing" secondItem="pEc-vv-7Ts" secondAttribute="trailing" constant="-8" id="Sof-6L-T2D"/>
+                                    <constraint firstItem="gEf-Ra-RyA" firstAttribute="bottom" secondItem="pEc-vv-7Ts" secondAttribute="bottom" constant="-10" id="TMx-5J-z2P"/>
+                                    <constraint firstItem="gEf-Ra-RyA" firstAttribute="leading" secondItem="UBq-oH-pKp" secondAttribute="leading" id="U6l-7M-bm4"/>
+                                    <constraint firstItem="gEf-Ra-RyA" firstAttribute="trailing" secondItem="UBq-oH-pKp" secondAttribute="trailing" id="YKE-TR-fTB"/>
+                                    <constraint firstItem="UBq-oH-pKp" firstAttribute="trailing" secondItem="pEc-vv-7Ts" secondAttribute="trailing" constant="-10" id="yZd-eO-85k"/>
+                                </constraints>
+                                <userDefinedRuntimeAttributes>
+                                    <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
+                                        <integer key="value" value="12"/>
+                                    </userDefinedRuntimeAttribute>
+                                </userDefinedRuntimeAttributes>
+                            </view>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="sAi-8j-0n1" customClass="PopupTriangle" customModule="AppCheck" customModuleProvider="target">
+                                <rect key="frame" x="278" y="46" width="28" height="22"/>
+                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="22" id="MaD-aD-U8h"/>
+                                    <constraint firstAttribute="width" constant="28" id="ntP-rP-UMh"/>
+                                </constraints>
+                                <userDefinedRuntimeAttributes>
+                                    <userDefinedRuntimeAttribute type="color" keyPath="color">
+                                        <color key="value" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                                    </userDefinedRuntimeAttribute>
+                                </userDefinedRuntimeAttributes>
+                            </view>
+                        </subviews>
+                        <color key="backgroundColor" white="0.0" alpha="0.2" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <gestureRecognizers/>
+                        <constraints>
+                            <constraint firstItem="sAi-8j-0n1" firstAttribute="bottom" secondItem="pEc-vv-7Ts" secondAttribute="top" constant="4" id="DCq-Ps-sQo"/>
+                            <constraint firstItem="pEc-vv-7Ts" firstAttribute="top" secondItem="jAM-LN-evh" secondAttribute="bottom" constant="20" id="EdA-nv-DEa"/>
+                            <constraint firstItem="u0F-hK-vVD" firstAttribute="trailing" secondItem="pEc-vv-7Ts" secondAttribute="trailing" constant="8" id="Iow-GV-Lxy"/>
+                            <constraint firstItem="jAM-LN-evh" firstAttribute="trailing" secondItem="u0F-hK-vVD" secondAttribute="trailing" id="Lju-K6-G89"/>
+                            <constraint firstItem="jAM-LN-evh" firstAttribute="top" secondItem="u0F-hK-vVD" secondAttribute="top" id="MqW-YU-POp"/>
+                            <constraint firstItem="pEc-vv-7Ts" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="u0F-hK-vVD" secondAttribute="leading" constant="8" id="V9T-2Y-oNy"/>
+                            <constraint firstItem="sAi-8j-0n1" firstAttribute="trailing" secondItem="pEc-vv-7Ts" secondAttribute="trailing" constant="-6" id="cXH-3c-s6t"/>
+                            <constraint firstItem="jAM-LN-evh" firstAttribute="leading" secondItem="u0F-hK-vVD" secondAttribute="leading" id="ula-eW-vAq"/>
+                        </constraints>
+                        <viewLayoutGuide key="safeArea" id="u0F-hK-vVD"/>
+                        <connections>
+                            <outletCollection property="gestureRecognizers" destination="oRi-17-cVM" appends="YES" id="2pk-5e-eJD"/>
+                        </connections>
+                    </view>
+                    <extendedEdge key="edgesForExtendedLayout" bottom="YES"/>
+                    <size key="freeformSize" width="320" height="320"/>
+                    <connections>
+                        <outlet property="buttonRangeEnd" destination="IG3-Wc-UI4" id="wAd-ca-bVQ"/>
+                        <outlet property="buttonRangeStart" destination="FVD-kB-91w" id="HbX-Vl-uBE"/>
+                        <outlet property="durationLabel" destination="ika-su-PZQ" id="1Br-vu-xir"/>
+                        <outlet property="durationSlider" destination="qhe-6d-hGB" id="wph-zX-WIz"/>
+                        <outlet property="durationView" destination="ucF-MH-iRP" id="TCI-Pp-drf"/>
+                        <outlet property="rangeView" destination="9As-hA-MKt" id="0Mq-Gi-nF6"/>
+                        <outlet property="sectionTitle" destination="UBq-oH-pKp" id="JG9-aM-n6e"/>
+                        <outlet property="segmentControl" destination="UNT-qn-2cg" id="JKs-2W-IRd"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="xTS-RW-xLN" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+                <tapGestureRecognizer id="oRi-17-cVM">
+                    <connections>
+                        <outlet property="delegate" destination="r7v-PM-PrR" id="JME-7W-w51"/>
+                    </connections>
+                </tapGestureRecognizer>
+            </objects>
+            <point key="canvasLocation" x="700" y="-1800"/>
+        </scene>
         <!--Domains-->
         <scene sceneID="MN1-aZ-cZt">
             <objects>
@@ -54,23 +244,23 @@
                         <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                         <prototypes>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationWidth="10" reuseIdentifier="DomainCell" textLabel="0HB-5f-eB1" detailTextLabel="MRe-Eq-gvc" style="IBUITableViewCellStyleSubtitle" id="F8D-aK-j1W">
-                                <rect key="frame" x="0.0" y="28" width="320" height="55.5"/>
+                                <rect key="frame" x="0.0" y="28" width="320" height="57.5"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="F8D-aK-j1W" id="FY2-xr-hqh">
-                                    <rect key="frame" x="0.0" y="0.0" width="293" height="55.5"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="293" height="57.5"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="0HB-5f-eB1">
-                                            <rect key="frame" x="16" y="10" width="33.5" height="20.5"/>
+                                            <rect key="frame" x="16" y="9" width="33.5" height="20.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
-                                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                            <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                             <nil key="textColor"/>
                                             <nil key="highlightedColor"/>
                                         </label>
-                                        <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Subtitle" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="MRe-Eq-gvc">
-                                            <rect key="frame" x="16" y="31.5" width="44" height="14.5"/>
+                                        <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Subtitle" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="MRe-Eq-gvc">
+                                            <rect key="frame" x="16" y="32.5" width="44" height="14.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
-                                            <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                                            <fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
                                             <color key="textColor" systemColor="secondaryLabelColor" red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
                                             <nil key="highlightedColor"/>
                                         </label>
@@ -86,7 +276,25 @@
                             <outlet property="delegate" destination="pdd-aM-sKl" id="3RN-az-SYU"/>
                         </connections>
                     </tableView>
-                    <navigationItem key="navigationItem" title="Domains" id="nY5-jL-QT9"/>
+                    <navigationItem key="navigationItem" title="Domains" id="nY5-jL-QT9">
+                        <barButtonItem key="leftBarButtonItem" systemItem="search" id="FHY-of-M4V">
+                            <connections>
+                                <action selector="searchButtonTapped:" destination="pdd-aM-sKl" id="HH1-6f-mcM"/>
+                            </connections>
+                        </barButtonItem>
+                        <rightBarButtonItems>
+                            <barButtonItem image="filter-clear" id="FZm-Ld-jJE">
+                                <connections>
+                                    <action selector="filterButtonTapped:" destination="pdd-aM-sKl" id="Xyy-LF-eCF"/>
+                                </connections>
+                            </barButtonItem>
+                            <barButtonItem enabled="NO" title="7 days" id="wxA-bC-1pN"/>
+                        </rightBarButtonItems>
+                    </navigationItem>
+                    <connections>
+                        <outlet property="filterButton" destination="FZm-Ld-jJE" id="g96-Q2-cYX"/>
+                        <outlet property="filterButtonDetail" destination="wxA-bC-1pN" id="CgP-oz-aXa"/>
+                    </connections>
                 </tableViewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="jfx-iA-E0v" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
             </objects>
@@ -102,23 +310,23 @@
                         <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                         <prototypes>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="HostCell" textLabel="Rnk-SP-UHm" detailTextLabel="ovQ-lJ-hWJ" style="IBUITableViewCellStyleSubtitle" id="uv0-9B-Zbb">
-                                <rect key="frame" x="0.0" y="28" width="320" height="55.5"/>
+                                <rect key="frame" x="0.0" y="28" width="320" height="57.5"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="uv0-9B-Zbb" id="6vH-Du-gCg">
-                                    <rect key="frame" x="0.0" y="0.0" width="293" height="55.5"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="293" height="57.5"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Rnk-SP-UHm">
-                                            <rect key="frame" x="16" y="10" width="33.5" height="20.5"/>
+                                            <rect key="frame" x="16" y="9" width="33.5" height="20.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
-                                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                            <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                             <nil key="textColor"/>
                                             <nil key="highlightedColor"/>
                                         </label>
-                                        <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Subtitle" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="ovQ-lJ-hWJ">
-                                            <rect key="frame" x="16" y="31.5" width="44" height="14.5"/>
+                                        <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Subtitle" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="ovQ-lJ-hWJ">
+                                            <rect key="frame" x="16" y="32.5" width="44" height="14.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
-                                            <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                                            <fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
                                             <color key="textColor" systemColor="secondaryLabelColor" red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
                                             <nil key="highlightedColor"/>
                                         </label>
@@ -159,7 +367,7 @@
                                         <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" enabled="NO" adjustsFontSizeToFit="NO" id="J2P-mU-Vad">
                                             <rect key="frame" x="16" y="0.0" width="288" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
-                                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                            <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                             <nil key="textColor"/>
                                             <nil key="highlightedColor"/>
                                         </label>
@@ -278,23 +486,23 @@
                         <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                         <prototypes>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" accessoryType="detailButton" indentationWidth="10" reuseIdentifier="PreviousRecordCell" textLabel="hr0-Xt-5gV" detailTextLabel="Xav-Ub-clj" style="IBUITableViewCellStyleSubtitle" id="3kW-3B-1bx">
-                                <rect key="frame" x="0.0" y="28" width="320" height="55.5"/>
+                                <rect key="frame" x="0.0" y="28" width="320" height="57.5"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="3kW-3B-1bx" id="OKV-a6-jjd">
-                                    <rect key="frame" x="0.0" y="0.0" width="280" height="55.5"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="280" height="57.5"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="hr0-Xt-5gV">
-                                            <rect key="frame" x="16" y="10" width="33.5" height="20.5"/>
+                                            <rect key="frame" x="16" y="9" width="33.5" height="20.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
-                                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                            <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                             <nil key="textColor"/>
                                             <nil key="highlightedColor"/>
                                         </label>
-                                        <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Subtitle" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Xav-Ub-clj">
-                                            <rect key="frame" x="16" y="31.5" width="44" height="14.5"/>
+                                        <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Subtitle" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Xav-Ub-clj">
+                                            <rect key="frame" x="16" y="32.5" width="44" height="14.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
-                                            <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                                            <fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
                                             <color key="textColor" systemColor="secondaryLabelColor" red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
                                             <nil key="highlightedColor"/>
                                         </label>
@@ -394,7 +602,7 @@
 3. Line
 4. Line</string>
                                                 <color key="textColor" systemColor="labelColor" cocoaTouchSystemColor="darkTextColor"/>
-                                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                                <fontDescription key="fontDescription" style="UICTFontTextStyleFootnote"/>
                                                 <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
                                                 <connections>
                                                     <outlet property="delegate" destination="VRk-wv-rhk" id="vej-jI-13V"/>
@@ -494,14 +702,14 @@ Duration:	60:00</string>
                                         <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="rN0-kA-Eln">
                                             <rect key="frame" x="16" y="12" width="33.5" height="20.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
-                                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                            <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                             <nil key="textColor"/>
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Detail" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="xRp-XG-oKf">
                                             <rect key="frame" x="260" y="12" width="44" height="20.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
-                                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                            <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                             <color key="textColor" systemColor="secondaryLabelColor" red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
                                             <nil key="highlightedColor"/>
                                         </label>
@@ -563,7 +771,7 @@ Duration:	60:00</string>
                                                 </switch>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="VPN Proxy enabled" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Qha-4I-go0">
                                                     <rect key="frame" x="16" y="12" width="147" height="20"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                                     <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
@@ -589,16 +797,16 @@ Duration:	60:00</string>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Ignore" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="UdM-Zm-G9p">
-                                                    <rect key="frame" x="16" y="14" width="91" height="16"/>
+                                                    <rect key="frame" x="16" y="13" width="91" height="18"/>
                                                     <autoresizingMask key="autoresizingMask"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="13"/>
+                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleSubhead"/>
                                                     <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="0 Domains" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="bHb-Tw-nPR">
-                                                    <rect key="frame" x="113" y="14" width="64.5" height="16"/>
+                                                    <rect key="frame" x="113" y="13" width="73" height="18"/>
                                                     <autoresizingMask key="autoresizingMask"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="13"/>
+                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleSubhead"/>
                                                     <color key="textColor" systemColor="secondaryLabelColor" red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
@@ -616,16 +824,16 @@ Duration:	60:00</string>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Block" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="fI0-Nt-Ucf">
-                                                    <rect key="frame" x="16" y="14" width="91" height="16"/>
+                                                    <rect key="frame" x="16" y="13" width="91" height="18"/>
                                                     <autoresizingMask key="autoresizingMask"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="13"/>
+                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleSubhead"/>
                                                     <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="0 Domains" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="CGG-47-cdc">
-                                                    <rect key="frame" x="113" y="14" width="64.5" height="16"/>
+                                                    <rect key="frame" x="113" y="13" width="73" height="18"/>
                                                     <autoresizingMask key="autoresizingMask"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="13"/>
+                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleSubhead"/>
                                                     <color key="textColor" systemColor="secondaryLabelColor" red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
@@ -648,6 +856,7 @@ Duration:	60:00</string>
                                             <subviews>
                                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="9Ko-sD-7x0">
                                                     <rect key="frame" x="125" y="7" width="70" height="30"/>
+                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleSubhead"/>
                                                     <state key="normal" title="Export DB"/>
                                                     <connections>
                                                         <action selector="exportDB:" destination="qdB-ZO-LHY" eventType="touchUpInside" id="3gu-WF-3Xa"/>
@@ -669,6 +878,7 @@ Duration:	60:00</string>
                                             <subviews>
                                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="S6B-i8-CoC">
                                                     <rect key="frame" x="74.5" y="7" width="171" height="30"/>
+                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleSubhead"/>
                                                     <state key="normal" title="Reset Introduction Alerts"/>
                                                     <connections>
                                                         <action selector="resetTutorialAlerts:" destination="qdB-ZO-LHY" eventType="touchUpInside" id="0GX-Ko-bk2"/>
@@ -690,6 +900,7 @@ Duration:	60:00</string>
                                             <subviews>
                                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="17e-nR-aCh">
                                                     <rect key="frame" x="111.5" y="7" width="97" height="30"/>
+                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleSubhead"/>
                                                     <state key="normal" title="Delete all logs">
                                                         <color key="titleColor" systemColor="systemRedColor" red="1" green="0.23137254900000001" blue="0.18823529410000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     </state>
@@ -742,7 +953,7 @@ Duration:	60:00</string>
                                         <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="MrS-rb-RLB">
                                             <rect key="frame" x="16" y="0.0" width="288" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
-                                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                            <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                             <nil key="textColor"/>
                                             <nil key="highlightedColor"/>
                                         </label>
@@ -772,6 +983,7 @@ Duration:	60:00</string>
         <segue reference="EzT-Xq-wka"/>
     </inferredMetricsTieBreakers>
     <resources>
+        <image name="filter-clear" width="20" height="20"/>
         <image name="journal" width="25" height="25"/>
         <image name="settings" width="25" height="25"/>
         <image name="tag" width="25" height="25"/>
diff --git a/main/DB/DBWrapper.swift b/main/DB/DBWrapper.swift
index ae8b903..657bc5c 100644
--- a/main/DB/DBWrapper.swift
+++ b/main/DB/DBWrapper.swift
@@ -4,6 +4,7 @@ let DBWrp = DBWrapper()
 fileprivate var AppDB: SQLiteDatabase? { get { try? SQLiteDatabase.open() } }
 
 class DBWrapper {
+	private var earliestEntry: Timestamp = 0
 	private var latestModification: Timestamp = 0
 	private var dataA: [GroupedDomain] = [] // Domains
 	private var dataB: [[GroupedDomain]] = [] // Hosts
@@ -39,9 +40,8 @@ class DBWrapper {
 			 $0.1 + ($1.1.contains(.ignored) ? 1 : 0)) }}
 	}
 	
-	func listOfTimes(_ domain: String?) -> [(Timestamp, Bool)] {
-		guard let domain = domain else { return [] }
-		return AppDB?.timesForDomain(domain)?.reversed() ?? []
+	func listOfTimes(_ domain: String) -> [(Timestamp, Bool)] {
+		return AppDB?.timesForDomain(domain, since: earliestEntry)?.reversed() ?? []
 	}
 	
 	
@@ -63,20 +63,28 @@ class DBWrapper {
 		}
 	}
 	
+	func reloadAfterDateFilterHasChanged() {
+		DispatchQueue.global().async {
+			self.dataAB_init()
+		}
+	}
+	
 	private func dataF_init() {
 		let list = AppDB?.loadFilters() ?? [:]
 		Q.async(flags: .barrier) {
 			self.dataF = list
-			NotifyFilterChanged.postAsyncMain()
+			NotifyDNSFilterChanged.postAsyncMain()
 		}
 	}
 	
 	private func dataAB_init() {
-		let list = AppDB?.domainList()
+		let earliest = Pref.DateFilter.lastXMinTimestamp() ?? 0
+		let list = AppDB?.domainList(since: earliest)
 		Q.async(flags: .barrier) {
 			self.dataA = []
 			self.dataB = []
-			self.latestModification = 0
+			self.earliestEntry = earliest
+			self.latestModification = earliest
 			if let allDomains = list {
 				for (parent, parts) in self.groupBySubdomains(allDomains) {
 					self.dataA.append(parent)
@@ -102,11 +110,20 @@ class DBWrapper {
 	// MARK: - Partial Update History
 	
 	@objc private func syncNewestLogs() {
-		//QLog.Debug("\(#function)")
+		dataA_mergeInsert();
+		if let lastXFilter = Pref.DateFilter.lastXMinTimestamp() {
+			if earliestEntry < lastXFilter {
+				dataA_mergeDelete(between: earliestEntry, and: lastXFilter)
+				earliestEntry = lastXFilter
+			}
+		}
+	}
+	
+	private func dataA_mergeInsert() {
 #if !IOS_SIMULATOR
 		guard currentVPNState == .on else { return }
 #endif
-		guard let res = AppDB?.domainList(since: latestModification), res.count > 0 else {
+		guard let res = AppDB?.domainList(since: latestModification + 1), res.count > 0 else {
 			return
 		}
 		QLog.Info("auto sync \(res.count) new logs")
@@ -114,7 +131,7 @@ class DBWrapper {
 			var c = 0
 			for (parent, parts) in self.groupBySubdomains(res) {
 				if let i = self.dataA_index(of: parent.domain) {
-					self.mergeExistingParts(parent.domain, at: i, newChildren: parts)
+					self.dataB_mergeInsert(parent.domain, at: i, newChildren: parts)
 					
 					let merged = parent + self.dataA.remove(at: i)
 					self.dataA.insert(merged, at: c)
@@ -124,6 +141,7 @@ class DBWrapper {
 					self.dataA.insert(parent, at: c)
 					self.dataB.insert(parts, at: c)
 					self.dataA_delegate?.insertRow(parent, at: c)
+					self.dataB_delegate(parent.domain)?.replaceData(with: parts);
 				}
 				c += 1
 				self.latestModification = max(parent.lastModified, self.latestModification)
@@ -131,7 +149,7 @@ class DBWrapper {
 		}
 	}
 	
-	private func mergeExistingParts(_ dom: String, at index: Int, newChildren: [GroupedDomain]) {
+	private func dataB_mergeInsert(_ dom: String, at index: Int, newChildren: [GroupedDomain]) {
 		let tvc = dataB_delegate(dom)
 		var i = 0
 		for child in newChildren {
@@ -148,7 +166,61 @@ class DBWrapper {
 	}
 	
 	
-	// MARK: - Delete History
+	// MARK: - Soft Delete History
+	// Will delete appearance only. DB still contains a copy.
+	
+	/// Technically not really deleting existing logs. Rather query DB for selected range and decrement whatever count is returned.
+	/// This means you should only run the delete operation once. As running multiple times will distrort the data.
+	/// - Parameters:
+	///   - between: Starting with and including
+	///   - and: Up until, exculding
+	private func dataA_mergeDelete(between: Timestamp, and: Timestamp) {
+		guard let res = AppDB?.domainList(between: between, and: and), res.count > 0 else {
+			return
+		}
+		QLog.Info("deleting \(res.count) old logs (soft delete)")
+		Q.async(flags: .barrier) {
+			for (parent, parts) in self.groupBySubdomains(res) {
+				guard let i = self.dataA_index(of: parent.domain) else {
+					continue // should never happen anyway
+				}
+				if parent.total < self.dataA[i].total {
+					self.dataB_mergeDelete(parent.domain, at: i, oldChildren: parts)
+					self.dataA[i] = self.dataA[i] - parent
+					self.dataA_delegate?.replaceRow(self.dataA[i], at: i)
+				} else {
+					self.dataA_delete(at: i, parentDomain: parent.domain)
+				}
+			}
+		}
+	}
+	
+	private func dataB_mergeDelete(_ dom: String, at index: Int, oldChildren: [GroupedDomain]) {
+		let tvc = dataB_delegate(dom)
+		for child in oldChildren {
+			guard let u = dataB[index].firstIndex(where: { $0.domain == child.domain }) else {
+				continue // should never happen anyway
+			}
+			if child.total < dataB[index][u].total {
+				dataB[index][u] = dataB[index][u] - child
+				tvc?.replaceRow(dataB[index][u], at: u)
+			} else {
+				dataB[index].remove(at: u)
+				tvc?.deleteRow(at: u)
+			}
+		}
+	}
+	
+	private func dataA_delete(at index: Int, parentDomain: String) {
+		dataA.remove(at: index)
+		dataB.remove(at: index)
+		dataA_delegate?.deleteRow(at: index)
+		dataB_delegate(parentDomain)?.replaceData(with: [])
+	}
+	
+	
+	// MARK: - Hard Delete History
+	// will delete DB content. No restore.
 	
 	func deleteHistory() {
 		DispatchQueue.global().async {
@@ -160,22 +232,21 @@ class DBWrapper {
 	
 	func deleteHistory(domain: String, since ts: Timestamp) {
 		DispatchQueue.global().async {
-			let modified = (try? AppDB?.deleteRows(matching: domain, since: ts)) ?? 0
+			let modified = (try? AppDB?.deleteRows(matching: domain, since: max(ts, self.earliestEntry))) ?? 0
 			guard modified > 0 else {
 				return // nothing has changed
 			}
+			QLog.Info("deleting \(modified) old logs (hard delete)")
 			AppDB?.vacuum()
 			self.Q.async(flags: .barrier) {
 				guard let index = self.dataA_index(of: domain) else {
 					return // nothing has changed
 				}
 				let parentDom = self.dataA[index].domain
-				guard let list = AppDB?.domainList(matching: parentDom), list.count > 0 else {
-					self.dataA.remove(at: index)
-					self.dataB.remove(at: index)
-					self.dataA_delegate?.deleteRow(at: index)
-					self.dataB_delegate(parentDom)?.replaceData(with: [])
-					return // nothing left, after deleting matching rows
+				guard let list = AppDB?.domainList(matching: parentDom, since: self.earliestEntry),
+					list.count > 0 else {
+						self.dataA_delete(at: index, parentDomain: parentDom)
+						return // nothing left, after deleting matching rows
 				}
 				// else: incremental update, replace whole list
 				self.dataA[index] = list.merge(parentDom, options: self.dataF[parentDom])
@@ -217,7 +288,7 @@ class DBWrapper {
 					self.dataB_delegate(self.dataA[i].domain)?.replaceRow(self.dataB[i][u], at: u)
 				}
 			}
-			NotifyFilterChanged.postAsyncMain()
+			NotifyDNSFilterChanged.postAsyncMain()
 		}
 	}
 	
diff --git a/main/DB/SQDB.swift b/main/DB/SQDB.swift
index 2293668..8b537f1 100644
--- a/main/DB/SQDB.swift
+++ b/main/DB/SQDB.swift
@@ -80,15 +80,19 @@ class SQLiteDatabase {
 		}
 	}
 	
-	func run<T>(sql: String, bind: ((OpaquePointer) -> Bool)?, step: (OpaquePointer) throws -> T) throws -> T {
+	func run<T>(sql: String, bind: [DBBinding?] = [], step: (OpaquePointer) throws -> T) throws -> T {
 		var statement: OpaquePointer?
 		guard sqlite3_prepare_v2(dbPointer, sql, -1, &statement, nil) == SQLITE_OK,
 			let stmt = statement else {
 				throw SQLiteError.Prepare(message: errorMessage)
 		}
 		defer { sqlite3_finalize(stmt) }
-		guard bind?(stmt) ?? true else {
-			throw SQLiteError.Bind(message: errorMessage)
+		var col: Int32 = 0
+		for b in bind.compactMap({$0}) {
+			col += 1
+			guard b.bind(stmt, col) == SQLITE_OK else {
+				throw SQLiteError.Bind(message: errorMessage)
+			}
 		}
 		return try step(stmt)
 	}
@@ -100,13 +104,11 @@ class SQLiteDatabase {
 	}
 	
 	func createTable(table: SQLTable.Type) throws {
-		try run(sql: table.createStatement, bind: nil) {
-			try ifStep($0, SQLITE_DONE)
-		}
+		try run(sql: table.createStatement) { try ifStep($0, SQLITE_DONE) }
 	}
 	
 	func vacuum() {
-		try? run(sql: "VACUUM;", bind: nil) { try ifStep($0, SQLITE_DONE) }
+		try? run(sql: "VACUUM;") { try ifStep($0, SQLITE_DONE) }
 	}
 }
 
@@ -115,25 +117,39 @@ protocol SQLTable {
 }
 
 
+// MARK: - Bindings
+
+protocol DBBinding {
+	func bind(_ stmt: OpaquePointer, _ col: Int32) -> Int32
+}
+
+struct BindInt32 : DBBinding {
+	let raw: Int32
+	init(_ value: Int32) { raw = value }
+	func bind(_ stmt: OpaquePointer, _ col: Int32) -> Int32 { sqlite3_bind_int(stmt, col, raw) }
+}
+
+struct BindInt64 : DBBinding {
+	let raw: sqlite3_int64
+	init(_ value: sqlite3_int64) { raw = value }
+	func bind(_ stmt: OpaquePointer, _ col: Int32) -> Int32 { sqlite3_bind_int64(stmt, col, raw) }
+}
+
+struct BindText : DBBinding {
+	let raw: String
+	init(_ value: String) { raw = value }
+	func bind(_ stmt: OpaquePointer, _ col: Int32) -> Int32 { sqlite3_bind_text(stmt, col, (raw as NSString).utf8String, -1, nil) }
+}
+
+struct BindTextOrNil : DBBinding {
+	let raw: String?
+	init(_ value: String?) { raw = value }
+	func bind(_ stmt: OpaquePointer, _ col: Int32) -> Int32 { sqlite3_bind_text(stmt, col, (raw == nil) ? nil : (raw! as NSString).utf8String, -1, nil) }
+}
+
 // MARK: - Easy Access func
 
 private extension SQLiteDatabase {
-	func bindInt(_ stmt: OpaquePointer, _ col: Int32, _ value: Int32) -> Bool {
-		sqlite3_bind_int(stmt, col, value) == SQLITE_OK
-	}
-	
-	func bindInt64(_ stmt: OpaquePointer, _ col: Int32, _ value: sqlite3_int64) -> Bool {
-		sqlite3_bind_int64(stmt, col, value) == SQLITE_OK
-	}
-	
-	func bindText(_ stmt: OpaquePointer, _ col: Int32, _ value: String) -> Bool {
-		sqlite3_bind_text(stmt, col, (value as NSString).utf8String, -1, nil) == SQLITE_OK
-	}
-	
-	func bindTextOrNil(_ stmt: OpaquePointer, _ col: Int32, _ value: String?) -> Bool {
-		sqlite3_bind_text(stmt, col, (value == nil) ? nil : (value! as NSString).utf8String, -1, nil) == SQLITE_OK
-	}
-	
 	func readText(_ stmt: OpaquePointer, _ col: Int32) -> String? {
 		let val = sqlite3_column_text(stmt, col)
 		return (val != nil ? String(cString: val!) : nil)
@@ -185,9 +201,8 @@ extension SQLiteDatabase {
 	// MARK: insert
 	
 	func insertDNSQuery(_ domain: String, blocked: Bool) throws {
-		try? run(sql: "INSERT INTO req (domain, logOpt) VALUES (?, ?);", bind: {
-			self.bindText($0, 1, domain) && self.bindInt($0, 2, blocked ? 1 : 0)
-		}) {
+		try? run(sql: "INSERT INTO req (domain, logOpt) VALUES (?, ?);",
+				 bind: [BindText(domain), BindInt32(blocked ? 1 : 0)]) {
 			try ifStep($0, SQLITE_DONE)
 		}
 	}
@@ -195,17 +210,14 @@ extension SQLiteDatabase {
 	// MARK: delete
 	
 	func destroyContent() throws {
-		try? run(sql: "DROP TABLE IF EXISTS req;", bind: nil) {
-			try ifStep($0, SQLITE_DONE)
-		}
+		try? run(sql: "DROP TABLE IF EXISTS req;") { try ifStep($0, SQLITE_DONE) }
 		try? createTable(table: DNSQueryT.self)
 	}
 	
 	/// Delete rows matching `ts >= ? AND "domain" OR "*.domain"`
 	@discardableResult func deleteRows(matching domain: String, since ts: Timestamp = 0) throws -> Int32 {
-		try run(sql: "DELETE FROM req WHERE ts >= ? AND (domain = ? OR domain LIKE '%.' || ?);", bind: {
-			self.bindInt64($0, 1, ts) && self.bindText($0, 2, domain) && self.bindText($0, 3, domain)
-		}) { stmt -> Int32 in
+		try run(sql: "DELETE FROM req WHERE ts >= ? AND (domain = ? OR domain LIKE '%.' || ?);",
+				bind: [BindInt64(ts), BindText(domain), BindText(domain)]) { stmt -> Int32 in
 			try ifStep(stmt, SQLITE_DONE)
 			return sqlite3_changes(dbPointer)
 		}
@@ -213,33 +225,35 @@ extension SQLiteDatabase {
 	
 	// MARK: read
 	
-	func readGroupedDomain(_ stmt: OpaquePointer) -> GroupedDomain {
-		GroupedDomain(domain: readText(stmt, 0) ?? "",
-					  total: sqlite3_column_int(stmt, 1),
-					  blocked: sqlite3_column_int(stmt, 2),
-					  lastModified: sqlite3_column_int64(stmt, 3))
+	private func allDomainsGrouped(_ clause: String = "", bind: [DBBinding?] = []) -> [GroupedDomain]? {
+		try? run(sql: "SELECT domain, COUNT(*), SUM(logOpt&1), MAX(ts) FROM req \(clause) GROUP BY domain ORDER BY 4 DESC;", bind: bind) {
+			allRows($0) {
+				GroupedDomain(domain: readText($0, 0) ?? "",
+							  total: sqlite3_column_int($0, 1),
+							  blocked: sqlite3_column_int($0, 2),
+							  lastModified: sqlite3_column_int64($0, 3))
+			}
+		}
 	}
 	
 	func domainList(since ts: Timestamp = 0) -> [GroupedDomain]? {
-		try? run(sql: "SELECT domain, COUNT(*), SUM(logOpt&1), MAX(ts) FROM req \(ts == 0 ? "" : "WHERE ts > ?") GROUP BY domain ORDER BY 4 DESC;", bind: {
-			ts == 0 || self.bindInt64($0, 1, ts)
-		}) {
-			allRows($0) { readGroupedDomain($0) }
-		}
+		ts==0 ? allDomainsGrouped() : allDomainsGrouped("WHERE ts >= ?", bind: [BindInt64(ts)])
 	}
 	
-	func domainList(matching domain: String) -> [GroupedDomain]? {
-		try? run(sql: "SELECT domain, COUNT(*), SUM(logOpt&1), MAX(ts) FROM req WHERE (domain = ? OR domain LIKE '%.' || ?) GROUP BY domain ORDER BY 4 DESC;", bind: {
-			self.bindText($0, 1, domain) && self.bindText($0, 2, domain)
-		}) {
-			allRows($0) { readGroupedDomain($0) }
-		}
+	/// Get grouped domains matching `ts >= ? AND "domain" OR "*.domain"`
+	func domainList(matching domain: String, since ts: Timestamp = 0) -> [GroupedDomain]? {
+		allDomainsGrouped("WHERE ts >= ? AND (domain = ? OR domain LIKE '%.' || ?)",
+						  bind: [BindInt64(ts), BindText(domain), BindText(domain)])
 	}
 	
-	func timesForDomain(_ fullDomain: String) -> [(Timestamp, Bool)]? {
-		try? run(sql: "SELECT ts, logOpt FROM req WHERE domain = ?;", bind: {
-			self.bindText($0, 1, fullDomain)
-		}) {
+	/// From `ts1` (including) and up to `ts2` (excluding). `ts1 >= X < ts2`
+	func domainList(between ts1: Timestamp, and ts2: Timestamp) -> [GroupedDomain]? {
+		allDomainsGrouped("WHERE ts >= ? AND ts < ?", bind: [BindInt64(ts1), BindInt64(ts2)])
+	}
+	
+	func timesForDomain(_ fullDomain: String, since ts: Timestamp = 0) -> [(Timestamp, Bool)]? {
+		try? run(sql: "SELECT ts, logOpt FROM req WHERE ts >= ? AND domain = ?;",
+				 bind: [BindInt64(ts), BindText(fullDomain)]) {
 			allRows($0) { (sqlite3_column_int64($0, 0), sqlite3_column_int($0, 1) > 0) }
 		}
 	}
@@ -266,7 +280,7 @@ extension SQLiteDatabase {
 	// MARK: read
 	
 	func loadFilters() -> [String : FilterOptions]? {
-		try? run(sql: "SELECT domain, opt FROM filter;", bind: nil) {
+		try? run(sql: "SELECT domain, opt FROM filter;") {
 			allRowsKeyed($0) {
 				(key: readText($0, 0) ?? "",
 				 value: FilterOptions(rawValue: sqlite3_column_int($0, 1)))
@@ -278,9 +292,8 @@ extension SQLiteDatabase {
 	
 	func setFilter(_ domain: String, _ value: FilterOptions?) {
 		func removeFilter() {
-			try? run(sql: "DELETE FROM filter WHERE domain = ? LIMIT 1;", bind: {
-				self.bindText($0, 1, domain)
-			}) { stmt -> Void in
+			try? run(sql: "DELETE FROM filter WHERE domain = ? LIMIT 1;",
+					 bind: [BindText(domain)]) { stmt -> Void in
 				sqlite3_step(stmt)
 			}
 		}
@@ -289,16 +302,14 @@ extension SQLiteDatabase {
 			return
 		}
 		func createFilter() throws {
-			try run(sql: "INSERT OR FAIL INTO filter (domain, opt) VALUES (?, ?);", bind: {
-				self.bindText($0, 1, domain) && self.bindInt($0, 2, rv)
-			}) {
+			try run(sql: "INSERT OR FAIL INTO filter (domain, opt) VALUES (?, ?);",
+					bind: [BindText(domain), BindInt32(rv)]) {
 				try ifStep($0, SQLITE_DONE)
 			}
 		}
 		func updateFilter() {
-			try? run(sql: "UPDATE filter SET opt = ? WHERE domain = ? LIMIT 1;", bind: {
-				self.bindInt($0, 1, rv) && self.bindText($0, 2, domain)
-			}) { stmt -> Void in
+			try? run(sql: "UPDATE filter SET opt = ? WHERE domain = ? LIMIT 1;",
+					 bind: [BindInt32(rv), BindText(domain)]) { stmt -> Void in
 				sqlite3_step(stmt)
 			}
 		}
@@ -335,7 +346,7 @@ extension SQLiteDatabase {
 	// MARK: write
 	
 	func startNewRecording() throws -> Recording {
-		try run(sql: "INSERT INTO rec (stop) VALUES (NULL);", bind: nil) { stmt -> Recording in
+		try run(sql: "INSERT INTO rec (stop) VALUES (NULL);") { stmt -> Recording in
 			try ifStep(stmt, SQLITE_DONE)
 			return try getRecording(withID: sqlite3_last_insert_rowid(dbPointer))
 		}
@@ -344,28 +355,23 @@ extension SQLiteDatabase {
 	func stopRecording(_ r: inout Recording) {
 		guard r.stop == nil else { return }
 		let theID = r.id
-		try? run(sql: "UPDATE rec SET stop = (strftime('%s','now')) WHERE id = ? LIMIT 1;", bind: {
-			self.bindInt64($0, 1, theID)
-		}) { stmt -> Void in
+		try? run(sql: "UPDATE rec SET stop = (strftime('%s','now')) WHERE id = ? LIMIT 1;",
+				 bind: [BindInt64(theID)]) { stmt -> Void in
 			try ifStep(stmt, SQLITE_DONE)
 			r = try getRecording(withID: theID)
 		}
 	}
 	
 	func updateRecording(_ r: Recording) {
-		try? run(sql: "UPDATE rec SET title = ?, appid = ?, notes = ? WHERE id = ? LIMIT 1;", bind: {
-			self.bindTextOrNil($0, 1, r.title) && self.bindTextOrNil($0, 2, r.appId)
-				&& self.bindTextOrNil($0, 3, r.notes) && self.bindInt64($0, 4, r.id)
-		}) { stmt -> Void in
+		try? run(sql: "UPDATE rec SET title = ?, appid = ?, notes = ? WHERE id = ? LIMIT 1;",
+				 bind: [BindTextOrNil(r.title), BindTextOrNil(r.appId), BindTextOrNil(r.notes), BindInt64(r.id)]) { stmt -> Void in
 			sqlite3_step(stmt)
 		}
 	}
 	
 	func deleteRecording(_ r: Recording) throws -> Bool {
 		_ = try? deleteRecordingLogs(r.id)
-		return try run(sql: "DELETE FROM rec WHERE id = ? LIMIT 1;", bind: {
-			self.bindInt64($0, 1, r.id)
-		}) {
+		return try run(sql: "DELETE FROM rec WHERE id = ? LIMIT 1;", bind: [BindInt64(r.id)]) {
 			try ifStep($0, SQLITE_DONE)
 			return sqlite3_changes(dbPointer) > 0
 		}
@@ -384,22 +390,20 @@ extension SQLiteDatabase {
 	}
 	
 	func ongoingRecording() -> Recording? {
-		try? run(sql: "SELECT * FROM rec WHERE stop IS NULL LIMIT 1;", bind: nil) {
+		try? run(sql: "SELECT * FROM rec WHERE stop IS NULL LIMIT 1;") {
 			try ifStep($0, SQLITE_ROW)
 			return readRecording($0)
 		}
 	}
 	
 	func allRecordings() -> [Recording]? {
-		try? run(sql: "SELECT * FROM rec WHERE stop IS NOT NULL;", bind: nil) {
+		try? run(sql: "SELECT * FROM rec WHERE stop IS NOT NULL;") {
 			allRows($0) { readRecording($0) }
 		}
 	}
 	
 	func getRecording(withID: sqlite3_int64) throws -> Recording {
-		try run(sql: "SELECT * FROM rec WHERE id = ? LIMIT 1;", bind: {
-			self.bindInt64($0, 1, withID)
-		}) {
+		try run(sql: "SELECT * FROM rec WHERE id = ? LIMIT 1;", bind: [BindInt64(withID)]) {
 			try ifStep($0, SQLITE_ROW)
 			return readRecording($0)
 		}
@@ -434,17 +438,14 @@ extension SQLiteDatabase {
 		try? run(sql: """
 			INSERT INTO recLog (rid, ts, domain) SELECT ?, ts, domain FROM req
 			WHERE req.ts >= ? AND req.ts <= ?
-			""", bind: {
-			self.bindInt64($0, 1, r.id) && self.bindInt64($0, 2, r.start) && self.bindInt64($0, 3, end)
-		}) {
+			""", bind: [BindInt64(r.id), BindInt64(r.start), BindInt64(end)]) {
 			try ifStep($0, SQLITE_DONE)
 		}
 	}
 	
 	func deleteRecordingLogs(_ recId: sqlite3_int64, matchingDomain d: String? = nil) throws -> Int32 {
-		try run(sql: "DELETE FROM recLog WHERE rid = ? \(d==nil ? "" : "AND domain = ?");", bind: {
-			self.bindInt64($0, 1, recId) && (d==nil ? true : self.bindTextOrNil($0, 2,d))
-		}) {
+		try run(sql: "DELETE FROM recLog WHERE rid = ? \(d==nil ? "" : "AND domain = ?");",
+				bind: [BindInt64(recId), d==nil ? nil : BindText(d!)]) {
 			try ifStep($0, SQLITE_DONE)
 			return sqlite3_changes(dbPointer)
 		}
@@ -453,9 +454,8 @@ extension SQLiteDatabase {
 	// MARK: read
 	
 	func getRecordingsLogs(_ r: Recording) -> [RecordLog]? {
-		try? run(sql: "SELECT domain, COUNT() FROM recLog WHERE rid = ? GROUP BY domain;", bind: {
-			self.bindInt64($0, 1, r.id)
-		}) {
+		try? run(sql: "SELECT domain, COUNT() FROM recLog WHERE rid = ? GROUP BY domain;",
+				 bind: [BindInt64(r.id)]) {
 			allRows($0) { (readText($0, 0), sqlite3_column_int($0, 1)) }
 		}
 	}
diff --git a/main/Extensions/AlertSheet.swift b/main/Extensions/AlertSheet.swift
index 570d3db..7282f10 100644
--- a/main/Extensions/AlertSheet.swift
+++ b/main/Extensions/AlertSheet.swift
@@ -2,7 +2,7 @@ import UIKit
 
 extension UIAlertController {
 	func presentIn(_ viewController: UIViewController?) {
-		viewController?.present(self, animated: true, completion: nil)
+		viewController?.present(self, animated: true)
 	}
 }
 
@@ -68,7 +68,7 @@ func AlertDeleteLogs(_ domain: String, latest: Timestamp, success: @escaping (_
 		if idx >= times.count {
 			success(0)
 		} else {
-			success(Timestamp(Date().timeIntervalSince1970) - times[idx])
+			success(Timestamp.now() - times[idx])
 		}
 	}
 }
diff --git a/main/Extensions/DBExtensions.swift b/main/Extensions/DBExtensions.swift
index 167c086..d9878c2 100644
--- a/main/Extensions/DBExtensions.swift
+++ b/main/Extensions/DBExtensions.swift
@@ -1,10 +1,16 @@
 import Foundation
 
 extension GroupedDomain {
+	/// Return new `GroupedDomain` by adding `total` and `blocked` counts. Set `lastModified` to the maximum of the two.
 	static func +(a: GroupedDomain, b: GroupedDomain) -> Self {
 		GroupedDomain(domain: a.domain, total: a.total + b.total, blocked: a.blocked + b.blocked,
 					  lastModified: max(a.lastModified, b.lastModified), options: a.options ?? b.options )
 	}
+	/// Return new `GroupedDomain` by subtracting `total` and `blocked` counts.
+	static func -(a: GroupedDomain, b: GroupedDomain) -> Self {
+		GroupedDomain(domain: a.domain, total: a.total - b.total, blocked: a.blocked - b.blocked,
+					  lastModified: a.lastModified, options: a.options )
+	}
 }
 
 extension Array where Element == GroupedDomain {
@@ -26,7 +32,9 @@ extension Recording {
 }
 
 extension Timestamp {
+	/// - Returns: Time string with format `yyyy-MM-dd  HH:mm:ss`
 	func asDateTime() -> String { dateTimeFormat.string(from: self) }
 	func toDate() -> Date { Date(timeIntervalSince1970: Double(self)) }
 	static func now() -> Timestamp { Timestamp(Date().timeIntervalSince1970) }
+	static func past(minutes: Int) -> Timestamp { now() - Timestamp(minutes * 60) }
 }
diff --git a/main/Extensions/Generic.swift b/main/Extensions/Generic.swift
index 116e8f5..dec249a 100644
--- a/main/Extensions/Generic.swift
+++ b/main/Extensions/Generic.swift
@@ -99,6 +99,17 @@ struct TimeFormat {
 	static func since(_ date: Date, millis: Bool = false) -> String {
 		from(Date().timeIntervalSince(date), millis: millis)
 	}
+	/// Formatted duration string, e.g., `20 min` or `7 days`
+	/// - Parameters:
+	///   - minutes: Duration in minutes
+	///   - style: Default: `.short`
+	static func short(minutes: Int, style: DateComponentsFormatter.UnitsStyle = .short) -> String? {
+		let dcf = DateComponentsFormatter()
+		dcf.maximumUnitCount = 1
+		dcf.allowedUnits = [.day, .hour, .minute]
+		dcf.unitsStyle = style
+		return dcf.string(from: DateComponents(minute: minutes))
+	}
 }
 
 extension UIColor {
diff --git a/main/Extensions/Notifications.swift b/main/Extensions/Notifications.swift
index 037bc5a..dc4c8da 100644
--- a/main/Extensions/Notifications.swift
+++ b/main/Extensions/Notifications.swift
@@ -1,7 +1,8 @@
 import Foundation
 
 let NotifyVPNStateChanged = NSNotification.Name("GlassVPNStateChanged") // VPNState!
-let NotifyFilterChanged = NSNotification.Name("PSIFilterSettingsChanged") // nil!
+let NotifyDNSFilterChanged = NSNotification.Name("PSIDNSFilterSettingsChanged") // nil!
+let NotifyDateFilterChanged = NSNotification.Name("PSIDateFilterSettingsChanged") // nil!
 let NotifyLogHistoryReset = NSNotification.Name("PSILogHistoryReset") // nil!
 let NotifyRecordingChanged = NSNotification.Name("PSIRecordingChanged") // (Recording, deleted: Bool)!
 
diff --git a/main/Extensions/SharedState.swift b/main/Extensions/SharedState.swift
index 1050d50..0f4dba9 100644
--- a/main/Extensions/SharedState.swift
+++ b/main/Extensions/SharedState.swift
@@ -6,3 +6,36 @@ var currentVPNState: VPNState = .off
 public enum VPNState : Int {
 	case on = 1, inbetween, off
 }
+
+struct Pref {
+	struct DidShowTutorial {
+		static var Welcome: Bool {
+			get { UserDefaults.standard.bool(forKey: "didShowTutorialAppWelcome") }
+			set { UserDefaults.standard.set(newValue, forKey: "didShowTutorialAppWelcome") }
+		}
+		static var Recordings: Bool {
+			get { UserDefaults.standard.bool(forKey: "didShowTutorialRecordings") }
+			set { UserDefaults.standard.set(newValue, forKey: "didShowTutorialRecordings") }
+		}
+	}
+	struct DateFilter {
+		static var Kind: DateFilterKind {
+			get { DateFilterKind(rawValue: UserDefaults.standard.integer(forKey: "dateFilterType"))! }
+			set { UserDefaults.standard.set(newValue.rawValue, forKey: "dateFilterType") }
+		}
+		static var LastXMin: Int {
+			get { UserDefaults.standard.integer(forKey: "dateFilterLastXMin") }
+			set { UserDefaults.standard.set(newValue, forKey: "dateFilterLastXMin") }
+		}
+		
+		/// Return selected timestamp filter or `nil` if filtering is disabled.
+		/// - Returns: `Timestamp.now() - LastXMin * 60`
+		static func lastXMinTimestamp() -> Timestamp? {
+			if Kind != .LastXMin { return nil }
+			return Timestamp.past(minutes: Pref.DateFilter.LastXMin)
+		}
+	}
+}
+enum DateFilterKind: Int {
+	case Off = 0, LastXMin = 1, ABRange = 2;
+}
diff --git a/main/Extensions/TableView.swift b/main/Extensions/TableView.swift
index 3c03bf7..b199bb4 100644
--- a/main/Extensions/TableView.swift
+++ b/main/Extensions/TableView.swift
@@ -39,60 +39,96 @@ extension UIRefreshControl {
 	
 }
 
-// MARK: - Incremental Update Delegate
-
-protocol IncrementalDataSourceUpdate : UITableViewController {
-	var dataSource: [GroupedDomain] { get set }
-}
-
-extension IncrementalDataSourceUpdate {
-	func ifDisplayed(_ block: () -> Void) {
-		DispatchQueue.main.sync {
-			if self.tableView.window?.isKeyWindow ?? false {
-				block()
-				// TODO: custom handling if cell is being edited
-			} else {
-				self.tableView.reloadData()
-			}
-		}
-	}
-	func insertRow(_ obj: GroupedDomain, at index: Int) {
-		dataSource.insert(obj, at: index)
-		ifDisplayed {
-			self.tableView.insertRows(at: [IndexPath(row: index)], with: .left)
-		}
-	}
-	func moveRow(_ obj: GroupedDomain, from: Int, to: Int) {
-		dataSource.remove(at: from)
-		dataSource.insert(obj, at: to)
-		ifDisplayed {
-			let source = IndexPath(row: from)
-			let cell = self.tableView.cellForRow(at: source)
-			cell?.detailTextLabel?.text = obj.detailCellText
-			self.tableView.moveRow(at: source, to: IndexPath(row: to))
-		}
-	}
-	func replaceRow(_ obj: GroupedDomain, at index: Int) {
-		dataSource[index] = obj
-		ifDisplayed {
-			self.tableView.reloadRows(at: [IndexPath(row: index)], with: .automatic)
-		}
-	}
-	func deleteRow(at index: Int) {
-		dataSource.remove(at: index)
-		ifDisplayed {
-			self.tableView.deleteRows(at: [IndexPath(row: index)], with: .automatic)
-		}
-	}
-	func replaceData(with newData: [GroupedDomain]) {
-		dataSource = newData
-		ifDisplayed {
-			self.tableView.reloadData()
-		}
-	}
-}
+// MARK: TableView extensions
 
 extension IndexPath {
 	/// Convenience init with `section: 0`
 	public init(row: Int) { self.init(row: row, section: 0) }
 }
+
+extension UITableView {
+	/// Returns `true` if this `tableView` is the currently frontmost visible
+	var isFrontmost: Bool { window?.isKeyWindow ?? false }
+	
+	/// If frontmost window, perform `deleteRows()`; If not, perform `reloadData()`
+	func safeDeleteRow(_ index: Int, with animation: UITableView.RowAnimation = .automatic) {
+		isFrontmost ? deleteRows(at: [IndexPath(row: index)], with: animation) : reloadData()
+	}
+	/// If frontmost window, perform `reloadRows()`; If not, perform `reloadData()`
+	func safeReloadRow(_ index: Int, with animation: UITableView.RowAnimation = .automatic) {
+		isFrontmost ? reloadRows(at: [IndexPath(row: index)], with: animation) : reloadData()
+	}
+	/// If frontmost window, perform `insertRows()`; If not, perform `reloadData()`
+	func safeInsertRow(_ index: Int, with animation: UITableView.RowAnimation = .automatic) {
+		isFrontmost ? insertRows(at: [IndexPath(row: index)], with: animation) : reloadData()
+	}
+	/// If frontmost window, perform `moveRow()`; If not, perform `reloadData()`
+	func safeMoveRow(_ from: Int, to: Int) {
+		isFrontmost ? moveRow(at: IndexPath(row: from), to: IndexPath(row: to)) : reloadData()
+	}
+}
+
+
+// MARK: - Incremental Update Delegate
+
+enum IncrementalDataSourceUpdateOperation {
+	case ReloadTable, Update, Insert, Delete, Move
+}
+
+protocol IncrementalDataSourceUpdate : UITableViewController {
+	var dataSource: [GroupedDomain] { get set }
+	func shouldLiveUpdateIncrementalDataSource() -> Bool
+	/// - Warning: Called on a background thread!
+	/// - Parameters:
+	///   - operation: Row update action
+	///   - row: Which row index is affected? `IndexPath(row: row)`
+	///   - moveTo: Only set for `Move` operation, otherwise `-1`
+	func didUpdateIncrementalDataSource(_ operation: IncrementalDataSourceUpdateOperation, row: Int, moveTo: Int)
+}
+
+extension IncrementalDataSourceUpdate {
+	func shouldLiveUpdateIncrementalDataSource() -> Bool { true }
+	func didUpdateIncrementalDataSource(_: IncrementalDataSourceUpdateOperation, row: Int, moveTo: Int) {}
+	// TODO: custom handling if cell is being edited
+	
+	func insertRow(_ obj: GroupedDomain, at index: Int) {
+		dataSource.insert(obj, at: index)
+		if shouldLiveUpdateIncrementalDataSource() {
+			DispatchQueue.main.sync { tableView.safeInsertRow(index, with: .left) }
+		}
+		didUpdateIncrementalDataSource(.Insert, row: index, moveTo: -1)
+	}
+	func moveRow(_ obj: GroupedDomain, from: Int, to: Int) {
+		dataSource.remove(at: from)
+		dataSource.insert(obj, at: to)
+		if shouldLiveUpdateIncrementalDataSource() {
+			DispatchQueue.main.sync {
+				let cell = tableView.cellForRow(at: IndexPath(row: from))
+				cell?.detailTextLabel?.text = obj.detailCellText
+				tableView.safeMoveRow(from, to: to)
+			}
+		}
+		didUpdateIncrementalDataSource(.Move, row: from, moveTo: to)
+	}
+	func replaceRow(_ obj: GroupedDomain, at index: Int) {
+		dataSource[index] = obj
+		if shouldLiveUpdateIncrementalDataSource() {
+			DispatchQueue.main.sync { tableView.safeReloadRow(index) }
+		}
+		didUpdateIncrementalDataSource(.Update, row: index, moveTo: -1)
+	}
+	func deleteRow(at index: Int) {
+		dataSource.remove(at: index)
+		if shouldLiveUpdateIncrementalDataSource() {
+			DispatchQueue.main.sync { tableView.safeDeleteRow(index) }
+		}
+		didUpdateIncrementalDataSource(.Delete, row: index, moveTo: -1)
+	}
+	func replaceData(with newData: [GroupedDomain]) {
+		dataSource = newData
+		if shouldLiveUpdateIncrementalDataSource() {
+			DispatchQueue.main.sync { tableView.reloadData() }
+		}
+		didUpdateIncrementalDataSource(.ReloadTable, row: -1, moveTo: -1)
+	}
+}
diff --git a/main/Recordings/VCRecordings.swift b/main/Recordings/VCRecordings.swift
index e317d2e..1d55d4e 100644
--- a/main/Recordings/VCRecordings.swift
+++ b/main/Recordings/VCRecordings.swift
@@ -20,7 +20,7 @@ class VCRecordings: UIViewController, UINavigationControllerDelegate {
 		updateUI(setRecording: false, animated: false)
 		currentRecording = DBWrp.recordingGetCurrent()
 		
-		if !UserDefaults.standard.bool(forKey: "didShowTutorialRecordings") {
+		if !Pref.DidShowTutorial.Recordings {
 			self.perform(#selector(showTutorial), with: nil, afterDelay: 0.5)
 		}
 	}
@@ -136,7 +136,7 @@ class VCRecordings: UIViewController, UINavigationControllerDelegate {
 		))
 		x.buttonTitleDone = "Got it"
 		x.present {
-			UserDefaults.standard.set(true, forKey: "didShowTutorialRecordings")
+			Pref.DidShowTutorial.Recordings = true
 		}
 	}
 }
diff --git a/main/Requests/TVCDomains.swift b/main/Requests/TVCDomains.swift
index 165751b..86761e7 100644
--- a/main/Requests/TVCDomains.swift
+++ b/main/Requests/TVCDomains.swift
@@ -1,8 +1,24 @@
 import UIKit
 
-class TVCDomains: UITableViewController, IncrementalDataSourceUpdate {
+class TVCDomains: UITableViewController, IncrementalDataSourceUpdate, UISearchBarDelegate {
 	
 	internal var dataSource: [GroupedDomain] = []
+	private func dataSource(at: Int) -> GroupedDomain {
+		dataSource[(searchActive ? searchIndices[at] : at)]
+	}
+	private var searchActive: Bool = false
+	private var searchIndices: [Int] = []
+	private var searchTerm: String?
+	private let searchBar: UISearchBar = {
+		let x = UISearchBar(frame: CGRect.init(x: 0, y: 0, width: 20, height: 10))
+		x.sizeToFit()
+		x.showsCancelButton = true
+		x.autocapitalizationType = .none
+		x.autocorrectionType = .no
+		return x
+	}()
+	@IBOutlet private var filterButton: UIBarButtonItem!
+	@IBOutlet private var filterButtonDetail: UIBarButtonItem!
 	
 	override func viewDidLoad() {
 		super.viewDidLoad()
@@ -12,30 +28,129 @@ class TVCDomains: UITableViewController, IncrementalDataSourceUpdate {
 		NotifyLogHistoryReset.observe(call: #selector(reloadDataSource), on: self)
 		reloadDataSource()
 		DBWrp.dataA_delegate = self
+		searchBar.delegate = self
+		NotifyDateFilterChanged.observe(call: #selector(dateFilterChanged), on: self)
+		dateFilterChanged()
 	}
 	
 	@objc func reloadDataSource() {
 		dataSource = DBWrp.listOfDomains()
-		tableView.reloadData()
+		if searchActive {
+			searchBar(searchBar, textDidChange: "")
+		} else {
+			tableView.reloadData()
+		}
 	}
 	
 	override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
 		if let index = tableView.indexPathForSelectedRow?.row {
-			(segue.destination as? TVCHosts)?.parentDomain = dataSource[index].domain
+			(segue.destination as? TVCHosts)?.parentDomain = dataSource(at: index).domain
 		}
 	}
 	
 	
 	// MARK: - Table View Delegate
 	
-	override func tableView(_ _: UITableView, numberOfRowsInSection _: Int) -> Int { dataSource.count }
+	override func tableView(_ _: UITableView, numberOfRowsInSection _: Int) -> Int {
+		searchActive ? searchIndices.count : dataSource.count
+	}
 	
 	override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
 		let cell = tableView.dequeueReusableCell(withIdentifier: "DomainCell")!
-		let entry = dataSource[indexPath.row]
+		let entry = dataSource(at: indexPath.row)
 		cell.textLabel?.text = entry.domain
 		cell.detailTextLabel?.text = entry.detailCellText
 		cell.imageView?.image = entry.options?.tableRowImage()
 		return cell
 	}
+	
+	
+	// MARK: - Search
+	
+	@IBAction private func searchButtonTapped(_ sender: UIBarButtonItem) {
+		setSearch(hidden: searchActive)
+	}
+	
+	func searchBarCancelButtonClicked(_ searchBar: UISearchBar) {
+		setSearch(hidden: true)
+	}
+	
+	private func setSearch(hidden: Bool) {
+		searchActive = !hidden
+		searchIndices = []
+		searchTerm = nil
+		searchBar.text = nil
+		tableView.tableHeaderView = hidden ? nil : searchBar
+		if !hidden { searchBar.becomeFirstResponder() }
+		tableView.reloadData()
+	}
+	
+	func searchBar(_ searchBar: UISearchBar, textDidChange searchText: String) {
+		NSObject.cancelPreviousPerformRequests(withTarget: self, selector: #selector(performSearch), object: nil)
+		perform(#selector(performSearch), with: nil, afterDelay: 0.3)
+	}
+	
+	@objc private func performSearch() {
+		searchTerm = searchBar.text?.lowercased() ?? ""
+		searchIndices = dataSource.enumerated().compactMap {
+			if $1.domain.lowercased().contains(searchTerm!) { return $0 }
+			return nil
+		}
+		tableView.reloadData()
+	}
+	
+	func shouldLiveUpdateIncrementalDataSource() -> Bool { !searchActive }
+	
+	func didUpdateIncrementalDataSource(_ operation: IncrementalDataSourceUpdateOperation, row: Int, moveTo: Int) {
+		guard searchActive else {
+			return
+		}
+		switch operation {
+		case .ReloadTable:
+			DispatchQueue.main.sync { tableView.reloadData() }
+		case .Insert:
+			if dataSource[row].domain.lowercased().contains(searchTerm ?? "") {
+				searchIndices.insert(row, at: 0)
+				DispatchQueue.main.sync { tableView.safeInsertRow(0, with: .left) }
+			}
+		case .Delete:
+			if let idx = searchIndices.firstIndex(of: row) {
+				searchIndices.remove(at: idx)
+				DispatchQueue.main.sync { tableView.safeDeleteRow(idx) }
+			}
+		case .Update, .Move:
+			if let idx = searchIndices.firstIndex(of: row) {
+				if operation == .Move { searchIndices[idx] = moveTo }
+				DispatchQueue.main.sync { tableView.safeReloadRow(idx) }
+			}
+		}
+	}
+	
+	
+	// MARK: - Filter
+	
+	@IBAction private func filterButtonTapped(_ sender: UIBarButtonItem) {
+		let vc = self.storyboard!.instantiateViewController(withIdentifier: "domainFilter")
+		vc.modalPresentationStyle = .custom
+		if #available(iOS 13.0, *) {
+			vc.isModalInPresentation = true
+		}
+		present(vc, animated: true)
+	}
+	
+	@objc private func dateFilterChanged() {
+		switch Pref.DateFilter.Kind {
+		case .ABRange: // read start/end time
+			self.filterButtonDetail.title = "A – B"
+			self.filterButton.image = UIImage(named: "filter-filled")
+		case .LastXMin: // most recent
+			let lastXMin = Pref.DateFilter.LastXMin
+			if lastXMin == 0 { fallthrough }
+			self.filterButtonDetail.title = TimeFormat.short(minutes: lastXMin, style: .abbreviated)
+			self.filterButton.image = UIImage(named: "filter-filled")
+		default:
+			self.filterButtonDetail.title = ""
+			self.filterButton.image = UIImage(named: "filter-clear")
+		}
+	}
 }
diff --git a/main/Requests/VCDateFilter.swift b/main/Requests/VCDateFilter.swift
new file mode 100644
index 0000000..2af03f3
--- /dev/null
+++ b/main/Requests/VCDateFilter.swift
@@ -0,0 +1,117 @@
+import UIKit
+
+// TODO: (count > x) filter
+
+class VCDateFilter: UIViewController, UIGestureRecognizerDelegate {
+	
+	@IBOutlet private var segmentControl: UISegmentedControl!
+	@IBOutlet private var sectionTitle: UILabel!
+	
+	// entries no older than
+	@IBOutlet private var durationView: UIView!
+	@IBOutlet private var durationSlider: UISlider!
+	@IBOutlet private var durationLabel: UILabel!
+	private let durationTimes = [0, 1, 20, 60, 360, 720, 1440, 2880, 4320, 10080]
+	
+	// entries within range
+	@IBOutlet private var rangeView: UIView!
+	@IBOutlet private var buttonRangeStart: UIButton!
+	@IBOutlet private var buttonRangeEnd: UIButton!
+	
+	
+	override func viewDidLoad() {
+		super.viewDidLoad()
+		
+		segmentControl.selectedSegmentIndex = (Pref.DateFilter.Kind == .ABRange ? 1 : 0)
+		didChangeSegment(segmentControl)
+		segmentControl.setEnabled(false, forSegmentAt: 1) // TODO: until range filter is ready
+		
+		durationSlider.tag = -1 // otherwise wont update because `tag == 0`
+		durationSlider.value = Float(durationTimes.firstIndex(of: Pref.DateFilter.LastXMin) ?? 0) / 9
+		durationSliderChanged(durationSlider)
+		
+		var a = Timestamp(4).asDateTime() // TODO: load from preferences
+		var b = Timestamp.now().asDateTime()
+		a.removeLast(3) // remove seconds
+		b.removeLast(3)
+		buttonRangeStart.setTitle(a, for: .normal)
+		buttonRangeEnd.setTitle(b, for: .normal)
+	}
+	
+	@IBAction private func didChangeSegment(_ sender: UISegmentedControl) {
+		durationView.isHidden = (sender.selectedSegmentIndex != 0)
+		rangeView.isHidden = (sender.selectedSegmentIndex != 1)
+		switch sender.selectedSegmentIndex {
+		case 0: sectionTitle.text = "Show entries no older than"
+		case 1: sectionTitle.text = "Show entries within range"
+		default: break
+		}
+	}
+	
+	@IBAction private func durationSliderChanged(_ sender: UISlider) {
+		let i = Int((sender.value + (0.499/9)) * 9) // mid-value-switch
+		guard i >= 0, i <= 9 else { return }
+		sender.value = Float(i) / 9
+		if sender.tag != durationTimes[i] {
+			sender.tag = durationTimes[i]
+			durationLabel.text = (sender.tag == 0 ? "Off" : TimeFormat.short(minutes: sender.tag))
+		}
+	}
+	
+	@IBAction private func didTapRangeButton(_ sender: UIButton) {
+		// TODO: show date picker
+	}
+	
+	func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldReceive touch: UITouch) -> Bool {
+		if gestureRecognizer.view == touch.view {
+			let newXMin = durationSlider.tag
+			let newKind: DateFilterKind
+			if segmentControl.selectedSegmentIndex == 1 {
+				newKind = .ABRange
+			} else if newXMin > 0 {
+				newKind = .LastXMin
+			} else {
+				newKind = .Off
+			}
+			if Pref.DateFilter.Kind != newKind || Pref.DateFilter.LastXMin != newXMin {
+				Pref.DateFilter.Kind = newKind
+				Pref.DateFilter.LastXMin = newXMin
+				DBWrp.reloadAfterDateFilterHasChanged()
+				NotifyDateFilterChanged.post()
+			}
+			dismiss(animated: true)
+		}
+		return false
+	}
+}
+
+
+// MARK: White Triangle Popup Arrow
+
+@IBDesignable
+class PopupTriangle: UIView {
+	@IBInspectable var rotation: CGFloat = 0
+	@IBInspectable var color: UIColor = .black
+	
+	override func draw(_ rect: CGRect) {
+		guard let c = UIGraphicsGetCurrentContext() else { return }
+		let w = rect.width, h = rect.height
+		switch rotation {
+		case 90: // right
+			c.lineFromTo(x1: 0, y1: 0, x2: w, y2: h/2)
+			c.addLine(to: CGPoint(x: 0, y: h))
+		case 180: // bottom
+			c.lineFromTo(x1: w, y1: 0, x2: w/2, y2: h)
+			c.addLine(to: CGPoint(x: 0, y: 0))
+		case 270: // left
+			c.lineFromTo(x1: w, y1: h, x2: 0, y2: h/2)
+			c.addLine(to: CGPoint(x: w, y: 0))
+		default: // top
+			c.lineFromTo(x1: 0, y1: h, x2: w/2, y2: 0)
+			c.addLine(to: CGPoint(x: w, y: h))
+		}
+		c.closePath()
+		c.setFillColor(color.cgColor)
+		c.fillPath()
+	}
+}
diff --git a/main/Settings/TVCFilter.swift b/main/Settings/TVCFilter.swift
index 436f4f8..f6aa9e6 100644
--- a/main/Settings/TVCFilter.swift
+++ b/main/Settings/TVCFilter.swift
@@ -9,7 +9,7 @@ class TVCFilter: UITableViewController, EditActionsRemove {
 //		if #available(iOS 10.0, *) {
 //			tableView.refreshControl = UIRefreshControl(call: #selector(reloadDataSource), on: self)
 //		}
-		NotifyFilterChanged.observe(call: #selector(reloadDataSource), on: self)
+		NotifyDNSFilterChanged.observe(call: #selector(reloadDataSource), on: self)
 		reloadDataSource()
 	}
 
diff --git a/main/Settings/TVCSettings.swift b/main/Settings/TVCSettings.swift
index 94b6601..95ba379 100644
--- a/main/Settings/TVCSettings.swift
+++ b/main/Settings/TVCSettings.swift
@@ -11,7 +11,7 @@ class TVCSettings: UITableViewController {
 		super.viewDidLoad()
 		NotifyVPNStateChanged.observe(call: #selector(vpnStateChanged(_:)), on: self)
 		changedState(currentVPNState)
-		NotifyFilterChanged.observe(call: #selector(reloadDataSource), on: self)
+		NotifyDNSFilterChanged.observe(call: #selector(reloadDataSource), on: self)
 		reloadDataSource()
 	}
 	
@@ -53,8 +53,8 @@ class TVCSettings: UITableViewController {
 	}
 	
 	@IBAction func resetTutorialAlerts(_ sender: UIButton) {
-		UserDefaults.standard.removeObject(forKey: "didShowTutorialAppWelcome")
-		UserDefaults.standard.removeObject(forKey: "didShowTutorialRecordings")
+		Pref.DidShowTutorial.Welcome = false
+		Pref.DidShowTutorial.Recordings = false
 		Alert(title: sender.titleLabel?.text,
 			  text: "\nDone.\n\nYou may need to restart the application.").presentIn(self)
 	}
diff --git a/main/TBCMain.swift b/main/TBCMain.swift
index 3c173ae..e17896f 100644
--- a/main/TBCMain.swift
+++ b/main/TBCMain.swift
@@ -8,7 +8,7 @@ class TBCMain: UITabBarController {
 		NotifyVPNStateChanged.observe(call: #selector(vpnStateChanged(_:)), on: self)
 		changedState(currentVPNState)
 		
-		if !UserDefaults.standard.bool(forKey: "didShowTutorialAppWelcome") {
+		if !Pref.DidShowTutorial.Welcome {
 			self.perform(#selector(showWelcomeMessage), with: nil, afterDelay: 0.5)
 		}
 	}
@@ -37,7 +37,7 @@ class TBCMain: UITabBarController {
 			)
 		))
 		x.present {
-			UserDefaults.standard.set(true, forKey: "didShowTutorialAppWelcome")
+			Pref.DidShowTutorial.Welcome = true
 		}
 	}