From 5014c369b173b2a7c5f4ab5d9333b3e93a3fd0c8 Mon Sep 17 00:00:00 2001
From: Hydrus Network Developer <hydrus.admin@gmail.com>
Date: Wed, 18 Mar 2020 16:35:57 -0500
Subject: [PATCH] Version 389

---
 .gitignore                                    |   1 +
 help/changelog.html                           |  35 +++
 include/ClientController.py                   |  10 +
 include/ClientDB.py                           | 159 +++++++++-
 include/ClientDefaults.py                     |  32 +-
 include/ClientGUI.py                          |   2 +
 include/ClientGUIACDropdown.py                | 280 +++++++++++++-----
 include/ClientGUICanvas.py                    |  26 +-
 include/ClientGUICommon.py                    |  12 +-
 include/ClientGUIControls.py                  |   2 +-
 include/ClientGUIDialogsQuick.py              |   6 +-
 include/ClientGUIExport.py                    |   5 +-
 include/ClientGUIListBoxes.py                 | 280 ++----------------
 include/ClientGUIMPV.py                       |  21 +-
 include/ClientGUIManagement.py                | 133 +++++++--
 include/ClientGUIPages.py                     |   7 +
 include/ClientGUIPanels.py                    |  14 +-
 include/ClientGUIScrolledPanelsManagement.py  |  22 +-
 include/ClientGUIScrolledPanelsReview.py      |   9 +-
 include/ClientGUISearchPanels.py              |  11 +-
 include/ClientGUITags.py                      |  67 ++++-
 include/ClientImportOptions.py                |   2 +-
 include/ClientNetworkingDomain.py             |   6 +
 include/ClientNetworkingLogin.py              |  10 +-
 include/ClientOptions.py                      |   1 -
 include/ClientParsing.py                      |  54 ++--
 include/ClientSearch.py                       |   5 +
 include/HydrusConstants.py                    |  36 +--
 include/QtPorting.py                          |  23 +-
 .../login_scripts/nijie.info login script.png | Bin 2523 -> 0 bytes
 .../deviant art file page api parser.png      | Bin 0 -> 2203 bytes
 .../default/parsers/e621 file page parser.png | Bin 2329 -> 2345 bytes
 .../url_classes/deviant art file page api.png | Bin 0 -> 1856 bytes
 .../url_classes/deviant art file page.png     | Bin 2197 -> 1789 bytes
 .../e621 file page (old format).png           | Bin 0 -> 2003 bytes
 35 files changed, 793 insertions(+), 478 deletions(-)
 delete mode 100644 static/default/login_scripts/nijie.info login script.png
 create mode 100644 static/default/parsers/deviant art file page api parser.png
 create mode 100644 static/default/url_classes/deviant art file page api.png
 create mode 100644 static/default/url_classes/e621 file page (old format).png

diff --git a/.gitignore b/.gitignore
index 6ee95b3b..b5495897 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,6 +45,7 @@ db/*.db-wal
 db/*.crt
 db/*.key
 db/*.log
+db/*.conf
 db/client_files/
 db/server_files/
 db/missing_and_invalid_files/
\ No newline at end of file
diff --git a/help/changelog.html b/help/changelog.html
index 37fe4cde..7cbcda6e 100755
--- a/help/changelog.html
+++ b/help/changelog.html
@@ -8,6 +8,41 @@
 		<div class="content">
 			<h3>changelog</h3>
 			<ul>
+				<li><h3>version 389</h3></li>
+				<ul>
+					<li>downloaders:</li>
+					<li>the e621 file page parser is updated again, thanks to a user's contribution. this one gets md5 and file url more reliably, and also gets rating tag</li>
+					<li>added a 'e621 file page (old format)' url class to help match and search for files downloaded with the old format. please be aware there is no good solution to auto-convert old urls to a new format yet, so this connection does not (yet) solve the old/new comparison test</li>
+					<li>updated deviant art file post parser to use their json api. this should be more resilient to their current layout changes</li>
+					<li>the nijie.info login script appears no longer to function. as with exhentai last week, it has been removed to make it easier to log in with hydrus companion. please use hydrus companion if you would like to log into nijie.info</li>
+					<li>updated file lookup scripts for 'iqdb danbooru' and 'danbooru md5' thanks to a user's contribution</li>
+					<li>.</li>
+					<li>the rest:</li>
+					<li>the way the mpv.conf works changes this week. it is now correctly fully portable, stored in the db directory beside the .db files. if this file does not exist, the 'default' as stored under the install_dir/static/mpv-conf folder will auto-populate it. if you have been using a non-default mpv conf, please re-set it one time after update, and you should be good</li>
+					<li>the code that loads mpv.conf is now more graceful on 'missing file' errors, which now means when both the db conf and the default conf are missing</li>
+					<li>hitting escape on a tag autocomplete input that has text will now clear that text! note that hitting escape on an _empty_ a/c input will still do 'lose focus' and then 'close dialog'</li>
+					<li>updated the slideshow logic so that if a media with duration has a shorter duration than the slideshow duration (e.g. a gif that lasts 0.5s on a 10s slideshow), the media will keep looping until the duration is up. media that has duration longer than the slideshow time will continue to play through once completely, delaying slideshow progression and then stopping promptly when it has finished</li>
+					<li>the string transformation system now allows 'url percent encoding' under the encode/decode type!</li>
+					<li>fixed the 'only add existing tags' filter in the tag import options, which was denying all the tested tags. it seems to have been hit by a typo in the last three months</li>
+					<li>the 'favourite searches' defaults now include an 'empty page' entry, which is a convenient way to simply clear a page. all users will also get this on update, feel free to delete if you don't like/need it</li>
+					<li>opening a new search page from a tag or an active search predicate ('open a new search page for...' or middle-click) now copies the file service (e.g. looking at trash) from the original page</li>
+					<li>opening a new search page in the 'all known files' file domain when the tag domain should be 'all known tags' (a currently unsupported combination) now coerces the tag domain to 'all local tags'</li>
+					<li>checkboxes should now appear again on the collect-by dropdown in Fusion (and hopefully any other) style</li>
+					<li>fixed an issue where entering 'namespace:*' explicitly would show the much less efficient wildcard search rather than the efficient 'anything' namespace search</li>
+					<li>fixed an issue where wildcard search could include multiple asterisks in a row</li>
+					<li>fixed an issue with page duplication where the main management object was not being duplicated properly until a session reload, meaning the two pages would sometimes share signals and changes</li>
+					<li>an old wx delayed hide/show performance hack is removed, making the floating autocomplete dropdown now update more smoothly to resize or move requests, such as when the main gui window is dragged</li>
+					<li>the program base installation directory is now calculated more accurately, both when running from source and the frozen build, and when launched using a symlink</li>
+					<li>install dir and db dir are now specified in the help->about window</li>
+					<li>the petition page content checkbox list now has a taller minimum height</li>
+					<li>improved error text reporting in hydrus service login failure, hydrus service delay reason-setting, and all 'cancelled' errors across the program</li>
+					<li>the review services panel now has elided... text. when unusually long errors propagate up to its status texts, it now won't suddenly jump to 2,000 pixels wide. full text appears in tooltips</li>
+					<li>code refactoring: the tag autocomplete input now now takes responsibility for the active predicate list above it</li>
+					<li>refactored some tag lists and added typing hints to improve how current page predicates are determined</li>
+					<li>did some prep work for tag filters supporting wildcards, but it isn't ready yet</li>
+					<li>cleaned up some wx->Qt data fetching code</li>
+					<li>misc code cleanup</li>
+				</ul>
 				<li><h3>version 388</h3></li>
 				<ul>
 					<li>favourite searches:</li>
diff --git a/include/ClientController.py b/include/ClientController.py
index 6e4f10ca..c0afba42 100755
--- a/include/ClientController.py
+++ b/include/ClientController.py
@@ -718,6 +718,11 @@ class Controller( HydrusController.HydrusController ):
         return clipboard_text
         
     
+    def GetDefaultMPVConfPath( self ):
+        
+        return os.path.join( HC.STATIC_DIR, 'mpv-conf', 'default_mpv.conf' )
+        
+    
     def GetIdleShutdownWorkDue( self, time_to_stop ):
         
         work_to_do = []
@@ -737,6 +742,11 @@ class Controller( HydrusController.HydrusController ):
         return work_to_do
         
     
+    def GetMPVConfPath( self ):
+        
+        return os.path.join( self.db_dir, 'mpv.conf' )
+        
+    
     def GetNewOptions( self ):
         
         return self.new_options
diff --git a/include/ClientDB.py b/include/ClientDB.py
index 259927d3..3dc71f79 100755
--- a/include/ClientDB.py
+++ b/include/ClientDB.py
@@ -636,6 +636,19 @@ class DB( HydrusDB.HydrusDB ):
                 HydrusPaths.MirrorFile( source, dest )
                 
             
+            conf_files = [ 'mpv.conf' ]
+            
+            for conf_file in conf_files:
+                
+                source = os.path.join( self._db_dir, conf_file )
+                dest = os.path.join( path, conf_file )
+                
+                if os.path.exists( source ):
+                    
+                    HydrusPaths.MirrorFile( source, dest )
+                    
+                
+            
             def is_cancelled_hook():
                 
                 return job_key.IsCancelled()
@@ -3971,7 +3984,7 @@ class DB( HydrusDB.HydrusDB ):
         
         tag_ids_to_tags = { self._GetTagId( tag ) : tag for tag in tags }
         
-        counts = self._CacheCombinedFilesMappingsGetAutocompleteCounts( service_id, list(tag_ids_to_tags.keys()) )
+        counts = self._CacheCombinedFilesMappingsGetAutocompleteCounts( service_id, list( tag_ids_to_tags.keys() ) )
         
         existing_tag_ids = [ tag_id for ( tag_id, current_count, pending_count ) in counts if current_count > 0 ]
         
@@ -13856,6 +13869,137 @@ class DB( HydrusDB.HydrusDB ):
                 
             
         
+        if version == 388:
+            
+            try:
+                
+                favourite_search_manager = self._GetJSONDump( HydrusSerialisable.SERIALISABLE_TYPE_FAVOURITE_SEARCH_MANAGER )
+                
+                folders_to_names = favourite_search_manager.GetFoldersToNames()
+                
+                do_it = True
+                
+                if None in folders_to_names:
+                    
+                    if 'empty page' in folders_to_names[ None ]:
+                        
+                        do_it = False
+                        
+                    
+                
+                if do_it:
+                    
+                    foldername = None
+                    name = 'empty page'
+                    
+                    tag_search_context = ClientSearch.TagSearchContext()
+                    
+                    predicates = []
+                    
+                    file_search_context = ClientSearch.FileSearchContext( file_service_key = CC.LOCAL_FILE_SERVICE_KEY, tag_search_context = tag_search_context, predicates = predicates )
+                    
+                    synchronised = True
+                    media_sort = None
+                    media_collect = None
+                    
+                    new_rows = [ ( foldername, name, file_search_context, synchronised, media_sort, media_collect ) ]
+                    
+                    #
+                    
+                    rows = list( favourite_search_manager.GetFavouriteSearchRows() )
+                    
+                    rows.extend( new_rows )
+                    
+                    favourite_search_manager.SetFavouriteSearchRows( rows )
+                    
+                    self._SetJSONDump( favourite_search_manager )
+                    
+                
+            except Exception as e:
+                
+                HydrusData.PrintException( e )
+                
+                message = 'Trying to add an empty favourite search failed! Please let hydrus dev know!'
+                
+                self.pub_initial_message( message )
+                
+            
+            try:
+                
+                script_rows = ClientDefaults.GetDefaultScriptRows()
+                
+                for script_row in script_rows:
+                    
+                    dump_type = script_row[0]
+                    dump_name = script_row[1]
+                    
+                    self._c.execute( 'DELETE FROM json_dumps_named WHERE dump_type = ? AND dump_name = ?;', ( dump_type, dump_name ) )
+                    
+                
+                self._c.executemany( 'REPLACE INTO json_dumps_named VALUES ( ?, ?, ?, ?, ? );', script_rows )
+                
+            except Exception as e:
+                
+                HydrusData.PrintException( e )
+                
+                message = 'Trying to add new file lookup scripts search failed! Please let hydrus dev know!'
+                
+                self.pub_initial_message( message )
+                
+            
+            try:
+                
+                domain_manager = self._GetJSONDump( HydrusSerialisable.SERIALISABLE_TYPE_NETWORK_DOMAIN_MANAGER )
+                
+                domain_manager.Initialise()
+                
+                #
+                
+                domain_manager.OverwriteDefaultURLClasses( [ 'deviant art file page', 'deviant art file page api', 'e621 file page (old format)' ] )
+                
+                #
+                
+                domain_manager.OverwriteDefaultParsers( [ 'e621 file page parser', 'deviant art file page api parser' ] )
+                
+                #
+                
+                domain_manager.TryToLinkURLClassesAndParsers()
+                
+                #
+                
+                self._SetJSONDump( domain_manager )
+                
+                #
+                
+                login_manager = self._GetJSONDump( HydrusSerialisable.SERIALISABLE_TYPE_NETWORK_LOGIN_MANAGER )
+                
+                login_manager.Initialise()
+                
+                #
+                
+                login_manager.DeleteLoginScripts( [ 'nijie.info login script' ] )
+                
+                #
+                
+                if not login_manager.DomainHasALoginScript( 'nijie.info' ):
+                    
+                    login_manager.DeleteLoginDomain( 'nijie.info' )
+                    
+                
+                #
+                
+                self._SetJSONDump( login_manager )
+                
+            except Exception as e:
+                
+                HydrusData.PrintException( e )
+                
+                message = 'Trying to update some parsers failed! Please let hydrus dev know!'
+                
+                self.pub_initial_message( message )
+                
+            
+        
         
         self._controller.pub( 'splash_set_title_text', 'updated db to v{}'.format( HydrusData.ToHumanInt( version + 1 ) ) )
         
@@ -14491,6 +14635,19 @@ class DB( HydrusDB.HydrusDB ):
                 HydrusPaths.MergeFile( dest, dest + '.old' )
                 
             
+            conf_files = [ 'mpv.conf' ]
+            
+            for conf_file in conf_files:
+                
+                source = os.path.join( path, conf_file )
+                dest = os.path.join( self._db_dir, conf_file )
+                
+                if os.path.exists( source ):
+                    
+                    HydrusPaths.MirrorFile( source, dest )
+                    
+                
+            
         
         client_files_source = os.path.join( path, 'client_files' )
         client_files_default = os.path.join( self._db_dir, 'client_files' )
diff --git a/include/ClientDefaults.py b/include/ClientDefaults.py
index b8a9237e..431f3006 100644
--- a/include/ClientDefaults.py
+++ b/include/ClientDefaults.py
@@ -296,8 +296,9 @@ def GetDefaultScriptRows():
     
     script_info = []
     
+    script_info.append( ( 32, 'iqdb danbooru', 2, HydrusData.GetNow(), '''["http://danbooru.iqdb.org/", 1, 0, [55, 1, [[], "some hash bytes"]], "file", {}, [[29, 1, ["link to danbooru", [27, 6, [[26, 1, [[62, 2, [0, "td", {"class": "image"}, 1, null, false, [51, 1, [3, "", null, null, "example string"]]]], [62, 2, [0, "a", {}, 0, null, false, [51, 1, [3, "", null, null, "example string"]]]]]], 0, "href", [51, 1, [3, "", null, null, "example string"]], [55, 1, [[], "parsed information"]]]], [[30, 4, ["", 0, [27, 6, [[26, 1, [[62, 2, [0, "section", {"id": "tag-list"}, 0, null, false, [51, 1, [3, "", null, null, "example string"]]]], [62, 2, [0, "li", {"class": "tag-type-1"}, null, null, false, [51, 1, [3, "", null, null, "example string"]]]], [62, 2, [0, "a", {"class": "search-tag"}, 0, null, false, [51, 1, [3, "", null, null, "example string"]]]]]], 1, "", [51, 1, [3, "", null, null, "example string"]], [55, 1, [[], "parsed information"]]]], 0, false, "creator"]], [30, 4, ["", 0, [27, 6, [[26, 1, [[62, 2, [0, "section", {"id": "tag-list"}, 0, null, false, [51, 1, [3, "", null, null, "example string"]]]], [62, 2, [0, "li", {"class": "tag-type-3"}, null, null, false, [51, 1, [3, "", null, null, "example string"]]]], [62, 2, [0, "a", {"class": "search-tag"}, 0, null, false, [51, 1, [3, "", null, null, "example string"]]]]]], 1, "", [51, 1, [3, "", null, null, "example string"]], [55, 1, [[], "parsed information"]]]], 0, false, "series"]], [30, 4, ["", 0, [27, 6, [[26, 1, [[62, 2, [0, "section", {"id": "tag-list"}, 0, null, false, [51, 1, [3, "", null, null, "example string"]]]], [62, 2, [0, "li", {"class": "tag-type-4"}, null, null, false, [51, 1, [3, "", null, null, "example string"]]]], [62, 2, [0, "a", {"class": "search-tag"}, 0, null, false, [51, 1, [3, "", null, null, "example string"]]]]]], 1, "", [51, 1, [3, "", null, null, "example string"]], [55, 1, [[], "parsed information"]]]], 0, false, "character"]], [30, 4, ["", 0, [27, 6, [[26, 1, [[62, 2, [0, "section", {"id": "tag-list"}, 0, null, false, [51, 1, [3, "", null, null, "example string"]]]], [62, 2, [0, "li", {"class": "tag-type-0"}, null, null, false, [51, 1, [3, "", null, null, "example string"]]]], [62, 2, [0, "a", {"class": "search-tag"}, 0, null, false, [51, 1, [3, "", null, null, "example string"]]]]]], 1, "", [51, 1, [3, "", null, null, "example string"]], [55, 1, [[], "parsed information"]]]], 0, false, ""]], [30, 4, ["", 0, [27, 6, [[26, 1, [[62, 2, [0, "section", {"id": "post-information"}, null, null, false, [51, 1, [3, "", null, null, "example string"]]]], [62, 2, [0, "li", {}, null, null, false, [51, 1, [3, "", null, null, "example string"]]]]]], 1, "", [51, 1, [2, "Rating:*", null, null, "Rating: Safe"]], [55, 1, [[[0, 8]], "Rating: Safe"]]]], 0, false, "rating"]], [30, 4, ["", 7, [27, 6, [[26, 1, [[62, 2, [0, "section", {"id": "post-information"}, null, null, false, [51, 1, [3, "", null, null, "example string"]]]], [62, 2, [0, "li", {}, null, null, true, [51, 1, [2, "Source:*", null, null, "Source:"]]]], [62, 2, [0, "a", {}, null, null, false, [51, 1, [3, "", null, null, "example string"]]]]]], 0, "href", [51, 1, [3, "", null, null, "example string"]], [55, 1, [[], "parsed information"]]]], 0, false, [8, 0]]]]]], [30, 4, ["no iqdb match found", 8, [27, 6, [[26, 1, [[62, 2, [0, "th", {}, null, null, false, [51, 1, [3, "", null, null, "example string"]]]]]], 1, "", [51, 1, [3, "", null, null, "example string"]], [55, 1, [[], "parsed information"]]]], 0, false, [false, [51, 1, [2, "Best match", null, null, "Best match"]]]]]]]''' ) )
+    script_info.append( ( 32, 'danbooru md5', 2, HydrusData.GetNow(), '''["https://danbooru.donmai.us/", 0, 1, [55, 1, [[[4, "hex"]], "some hash bytes"]], "md5", {"page": "post", "s": "list"}, [[30, 4, ["we got sent back to main gallery page -- title test", 8, [27, 6, [[26, 1, [[62, 2, [0, "head", {}, 0, null, false, [51, 1, [3, "", null, null, "example string"]]]], [62, 2, [0, "title", {}, 0, null, false, [51, 1, [3, "", null, null, "example string"]]]]]], 1, "", [51, 1, [3, "", null, null, "example string"]], [55, 1, [[], "parsed information"]]]], 0, false, [true, [51, 1, [2, "Image List", null, null, "Image List"]]]]], [30, 4, ["", 0, [27, 6, [[26, 1, [[62, 2, [0, "li", {"class": "tag-type-0"}, null, null, false, [51, 1, [3, "", null, null, "example string"]]]], [62, 2, [0, "a", {}, 1, null, false, [51, 1, [3, "", null, null, "example string"]]]]]], 1, "", [51, 1, [3, "", null, null, "example string"]], [55, 1, [[], "parsed information"]]]], 0, false, ""]], [30, 4, ["", 0, [27, 6, [[26, 1, [[62, 2, [0, "li", {"class": "tag-type-3"}, null, null, false, [51, 1, [3, "", null, null, "example string"]]]], [62, 2, [0, "a", {}, 1, null, false, [51, 1, [3, "", null, null, "example string"]]]]]], 1, "", [51, 1, [3, "", null, null, "example string"]], [55, 1, [[], "parsed information"]]]], 0, false, "series"]], [30, 4, ["", 0, [27, 6, [[26, 1, [[62, 2, [0, "li", {"class": "tag-type-1"}, null, null, false, [51, 1, [3, "", null, null, "example string"]]]], [62, 2, [0, "a", {}, 1, null, false, [51, 1, [3, "", null, null, "example string"]]]]]], 1, "", [51, 1, [3, "", null, null, "example string"]], [55, 1, [[], "parsed information"]]]], 0, false, "creator"]], [30, 4, ["", 0, [27, 6, [[26, 1, [[62, 2, [0, "li", {"class": "tag-type-4"}, null, null, false, [51, 1, [3, "", null, null, "example string"]]]], [62, 2, [0, "a", {}, 1, null, false, [51, 1, [3, "", null, null, "example string"]]]]]], 1, "", [51, 1, [3, "", null, null, "example string"]], [55, 1, [[], "parsed information"]]]], 0, false, "character"]], [30, 4, ["we got sent back to main gallery page -- page links exist", 8, [27, 6, [[26, 1, [[62, 2, [0, "div", {}, null, null, false, [51, 1, [3, "", null, null, "example string"]]]]]], 0, "class", [51, 1, [3, "", null, null, "example string"]], [55, 1, [[], "parsed information"]]]], 0, false, [true, [51, 1, [2, "pagination", null, null, "pagination"]]]]], [30, 4, ["", 0, [27, 6, [[26, 1, [[62, 2, [0, "section", {"id": "post-information"}, null, null, false, [51, 1, [3, "", null, null, "example string"]]]], [62, 2, [0, "li", {}, null, null, false, [51, 1, [3, "", null, null, "example string"]]]]]], 1, "href", [51, 1, [2, "Rating:*", null, null, "Rating: Safe"]], [55, 1, [[[0, 8]], "Rating: Safe"]]]], 0, false, "rating"]]]]''' ) )
     script_info.append( ( 32, 'gelbooru md5', 1, HydrusData.GetNow(), '''["http://gelbooru.com/index.php", 0, 1, 1, "md5", {"s": "list", "page": "post"}, [[30, 1, ["we got sent back to main gallery page -- title test", 8, [27, 1, [[["head", {}, 0], ["title", {}, 0]], null]], [true, true, "Image List"]]], [30, 1, ["", 0, [27, 1, [[["li", {"class": "tag-type-general"}, null], ["a", {}, 1]], null]], ""]], [30, 1, ["", 0, [27, 1, [[["li", {"class": "tag-type-copyright"}, null], ["a", {}, 1]], null]], "series"]], [30, 1, ["", 0, [27, 1, [[["li", {"class": "tag-type-artist"}, null], ["a", {}, 1]], null]], "creator"]], [30, 1, ["", 0, [27, 1, [[["li", {"class": "tag-type-character"}, null], ["a", {}, 1]], null]], "character"]], [30, 1, ["we got sent back to main gallery page -- page links exist", 8, [27, 1, [[["div", {}, null]], "class"]], [true, true, "pagination"]]]]]''' ) )
-    script_info.append( ( 32, 'iqdb danbooru', 1, HydrusData.GetNow(), '''["http://danbooru.iqdb.org/", 1, 0, 0, "file", {}, [[29, 1, ["link to danbooru", [27, 1, [[["td", {"class": "image"}, 1], ["a", {}, 0]], "href"]], [[30, 1, ["", 0, [27, 1, [[["section", {"id": "tag-list"}, 0], ["li", {"class": "category-1"}, null], ["a", {"class": "search-tag"}, 0]], null]], "creator"]], [30, 1, ["", 0, [27, 1, [[["section", {"id": "tag-list"}, 0], ["li", {"class": "category-3"}, null], ["a", {"class": "search-tag"}, 0]], null]], "series"]], [30, 1, ["", 0, [27, 1, [[["section", {"id": "tag-list"}, 0], ["li", {"class": "category-4"}, null], ["a", {"class": "search-tag"}, 0]], null]], "character"]], [30, 1, ["", 0, [27, 1, [[["section", {"id": "tag-list"}, 0], ["li", {"class": "category-0"}, null], ["a", {"class": "search-tag"}, 0]], null]], ""]]]]], [30, 1, ["no iqdb match found", 8, [27, 1, [[["th", {}, null]], null]], [false, true, "Best match"]]]]]''' ) )
     
     return script_info
     
@@ -646,6 +647,10 @@ def SetDefaultFavouriteSearchManagerData( favourite_search_manager ):
     from . import ClientMedia
     from . import ClientSearch
     
+    rows = []
+    
+    #
+    
     foldername = 'example search'
     name = 'inbox filter'
     
@@ -669,12 +674,29 @@ def SetDefaultFavouriteSearchManagerData( favourite_search_manager ):
     media_sort = ClientMedia.MediaSort( sort_type = ( 'system', CC.SORT_FILES_BY_FILESIZE ), sort_asc = CC.SORT_DESC )
     media_collect = None
     
-    rows = [ ( foldername, name, file_search_context, synchronised, media_sort, media_collect ) ]
+    rows.append( ( foldername, name, file_search_context, synchronised, media_sort, media_collect ) )
+    
+    #
+    
+    foldername = None
+    name = 'empty page'
+    
+    tag_search_context = ClientSearch.TagSearchContext()
+    
+    predicates = []
+    
+    file_search_context = ClientSearch.FileSearchContext( file_service_key = CC.LOCAL_FILE_SERVICE_KEY, tag_search_context = tag_search_context, predicates = predicates )
+    
+    synchronised = True
+    media_sort = None
+    media_collect = None
+    
+    rows.append( ( foldername, name, file_search_context, synchronised, media_sort, media_collect ) )
+    
+    #
     
     favourite_search_manager.SetFavouriteSearchRows( rows )
-    
-    #inbox, system:limit=256, image, animation, video, sort by largest 
-    
+
 def SetDefaultLoginManagerScripts( login_manager ):
     
     default_login_scripts = GetDefaultLoginScripts()
diff --git a/include/ClientGUI.py b/include/ClientGUI.py
index a93af3a3..87a1213e 100755
--- a/include/ClientGUI.py
+++ b/include/ClientGUI.py
@@ -539,6 +539,8 @@ class FrameGUI( ClientGUITopLevelWindows.MainFrameThatResizes ):
         library_versions.append( ( 'html5lib present: ', str( ClientParsing.HTML5LIB_IS_OK ) ) )
         library_versions.append( ( 'lxml present: ', str( ClientParsing.LXML_IS_OK ) ) )
         library_versions.append( ( 'lz4 present: ', str( ClientRendering.LZ4_OK ) ) )
+        library_versions.append( ( 'install dir', HC.BASE_DIR ) )
+        library_versions.append( ( 'db dir', HG.client_controller.db_dir ) )
         library_versions.append( ( 'temp dir', HydrusPaths.GetCurrentTempDir() ) )
         
         import locale
diff --git a/include/ClientGUIACDropdown.py b/include/ClientGUIACDropdown.py
index 114ca097..5af526aa 100644
--- a/include/ClientGUIACDropdown.py
+++ b/include/ClientGUIACDropdown.py
@@ -68,7 +68,13 @@ def InsertStaticPredicatesForRead( predicates, parsed_search_text, include_unusu
         
         if include_unusual_predicate_types:
             
-            if explicit_wildcard:
+            ( namespace, subtag ) = HydrusTags.SplitTag( search_text )
+            
+            if namespace != '' and subtag in ( '', '*' ):
+                
+                predicates.insert( 0, ClientSearch.Predicate( ClientSearch.PREDICATE_TYPE_NAMESPACE, namespace, inclusive ) )
+                
+            elif explicit_wildcard:
                 
                 if wildcard_text != search_text:
                     
@@ -77,15 +83,6 @@ def InsertStaticPredicatesForRead( predicates, parsed_search_text, include_unusu
                 
                 predicates.insert( 0, ClientSearch.Predicate( ClientSearch.PREDICATE_TYPE_WILDCARD, wildcard_text, inclusive ) )
                 
-            else:
-                
-                ( namespace, subtag ) = HydrusTags.SplitTag( entry_text )
-                
-                if namespace != '' and subtag in ( '', '*' ):
-                    
-                    predicates.insert( 0, ClientSearch.Predicate( ClientSearch.PREDICATE_TYPE_NAMESPACE, namespace, inclusive ) )
-                    
-                
             
         
         try:
@@ -498,9 +495,6 @@ class AutoCompleteDropdown( QW.QWidget ):
         self._last_attempted_dropdown_width = 0
         self._last_attempted_dropdown_position = ( None, None )
         
-        self._last_move_event_started = 0.0
-        self._last_move_event_occurred = 0.0
-        
         self._text_ctrl_widget_event_filter = QP.WidgetEventFilter( self._text_ctrl )
         
         self._text_ctrl.textChanged.connect( self.EventText )
@@ -509,7 +503,9 @@ class AutoCompleteDropdown( QW.QWidget ):
         
         self._text_ctrl.installEventFilter( self )
         
-        vbox = QP.VBoxLayout( margin = 0 )
+        self._main_vbox = QP.VBoxLayout( margin = 0 )
+        
+        self._SetupTopListBox()
         
         self._text_input_hbox = QP.HBoxLayout()
         
@@ -517,7 +513,7 @@ class AutoCompleteDropdown( QW.QWidget ):
         
         self._text_input_panel.setLayout( self._text_input_hbox )
         
-        QP.AddToLayout( vbox, self._text_input_panel, CC.FLAGS_EXPAND_SIZER_PERPENDICULAR )
+        QP.AddToLayout( self._main_vbox, self._text_input_panel, CC.FLAGS_EXPAND_SIZER_PERPENDICULAR )
         
         if self._float_mode:
             
@@ -561,10 +557,10 @@ class AutoCompleteDropdown( QW.QWidget ):
         
         if not self._float_mode:
             
-            QP.AddToLayout( vbox, self._dropdown_window, CC.FLAGS_EXPAND_BOTH_WAYS )
+            QP.AddToLayout( self._main_vbox, self._dropdown_window, CC.FLAGS_EXPAND_BOTH_WAYS )
             
         
-        self.setLayout( vbox )
+        self.setLayout( self._main_vbox )
         
         self._current_list_raw_entry = ''
         self._next_search_is_probably_fast = False
@@ -585,7 +581,7 @@ class AutoCompleteDropdown( QW.QWidget ):
             self._widget_event_filter.EVT_MOVE( self.EventMove )
             self._widget_event_filter.EVT_SIZE( self.EventMove )
             
-            HG.client_controller.sub( self, '_ParentMovedOrResized', 'top_level_window_move_event' )
+            HG.client_controller.sub( self, '_DropdownHideShow', 'top_level_window_move_event' )
             
             parent = self
             
@@ -698,7 +694,13 @@ class AutoCompleteDropdown( QW.QWidget ):
     
     def _HandleEscape( self ):
         
-        if self._float_mode:
+        if self._text_ctrl.text() != '':
+            
+            self._ClearInput()
+            
+            return True
+            
+        elif self._float_mode:
             
             self.parentWidget().setFocus( QC.Qt.OtherFocusReason )
             
@@ -725,44 +727,6 @@ class AutoCompleteDropdown( QW.QWidget ):
         raise NotImplementedError()
         
     
-    def _ParentMovedOrResized( self ):
-        
-        if self._float_mode:
-            
-            if HydrusData.TimeHasPassedFloat( self._last_move_event_occurred + 1.0 ):
-                
-                self._last_move_event_started = HydrusData.GetNowFloat()
-                
-            
-            self._last_move_event_occurred = HydrusData.GetNowFloat()
-            
-            # we'll do smoother move updates for a little bit to stop flickeryness, but after that we'll just hide
-            
-            NICE_ANIMATION_GRACE_PERIOD = 0.25
-            
-            time_to_delay_these_calls = HydrusData.TimeHasPassedFloat( self._last_move_event_started + NICE_ANIMATION_GRACE_PERIOD )
-            
-            if time_to_delay_these_calls:
-                
-                self._HideDropdown()
-                
-                if self._ShouldShow():
-                    
-                    if self._move_hide_job is None:
-                        
-                        self._move_hide_job = HG.client_controller.CallRepeatingQtSafe( self._dropdown_window, 0.0, 0.25, self._DropdownHideShow )
-                        
-                    
-                    self._move_hide_job.Delay( 0.25 )
-                    
-                
-            else:
-                
-                self._DropdownHideShow()
-                
-            
-        
-    
     def _ScheduleListRefresh( self, delay ):
         
         if self._refresh_list_job is not None and delay == 0.0:
@@ -777,6 +741,11 @@ class AutoCompleteDropdown( QW.QWidget ):
             
         
     
+    def _SetupTopListBox( self ):
+        
+        pass
+        
+    
     def _SetListDirty( self ):
         
         self._search_text_for_current_cache = None
@@ -938,6 +907,15 @@ class AutoCompleteDropdown( QW.QWidget ):
                 
                 self._TakeResponsibilityForEnter( shift_down )
                 
+            elif key == QC.Qt.Key_Escape:
+                
+                escape_caught = self._HandleEscape()
+                
+                if not escape_caught:
+                    
+                    send_input_to_current_list = True
+                    
+                
             elif input_is_empty: # maybe we should be sending a 'move' event to a different place
                 
                 if key in ( QC.Qt.Key_Up, QC.Qt.Key_Down ) and current_list_is_empty:
@@ -975,15 +953,6 @@ class AutoCompleteDropdown( QW.QWidget ):
                     
                     self.MoveNotebookPageFocus( direction = direction )
                     
-                elif key == QC.Qt.Key_Escape:
-                    
-                    escape_caught = self._HandleEscape()
-                    
-                    if not escape_caught:
-                        
-                        send_input_to_current_list = True
-                        
-                    
                 else:
                     
                     send_input_to_current_list = True
@@ -1082,7 +1051,7 @@ class AutoCompleteDropdown( QW.QWidget ):
     
     def EventMove( self, event ):
         
-        self._ParentMovedOrResized()
+        self._DropdownHideShow()
         
         return True # was: event.ignore()
         
@@ -1349,13 +1318,17 @@ class AutoCompleteDropdownTags( AutoCompleteDropdown ):
     
 class AutoCompleteDropdownTagsRead( AutoCompleteDropdownTags ):
     
-    def __init__( self, parent: QW.QWidget, predicates_listbox: ClientGUIListBoxes.ListBoxTagsActiveSearchPredicates, page_key, file_search_context: ClientSearch.FileSearchContext, media_sort_widget: typing.Optional[ ClientGUISearch.MediaSortControl ] = None, media_collect_widget: typing.Optional[ ClientGUISearch.MediaCollectControl ] = None, media_callable = None, synchronised = True, include_unusual_predicate_types = True, allow_all_known_files = True, force_system_everything = False, hide_favourites_edit_actions = False ):
+    def __init__( self, parent: QW.QWidget, page_key, file_search_context: ClientSearch.FileSearchContext, media_sort_widget: typing.Optional[ ClientGUISearch.MediaSortControl ] = None, media_collect_widget: typing.Optional[ ClientGUISearch.MediaCollectControl ] = None, media_callable = None, synchronised = True, include_unusual_predicate_types = True, allow_all_known_files = True, force_system_everything = False, hide_favourites_edit_actions = False ):
         
-        self._predicates_listbox = predicates_listbox
+        self._page_key = page_key
         
         file_service_key = file_search_context.GetFileServiceKey()
         tag_search_context = file_search_context.GetTagSearchContext()
         
+        self._include_unusual_predicate_types = include_unusual_predicate_types
+        self._force_system_everything = force_system_everything
+        self._hide_favourites_edit_actions = hide_favourites_edit_actions
+        
         AutoCompleteDropdownTags.__init__( self, parent, file_service_key, tag_search_context.service_key )
         
         self._media_sort_widget = media_sort_widget
@@ -1364,9 +1337,6 @@ class AutoCompleteDropdownTagsRead( AutoCompleteDropdownTags ):
         self._allow_all_known_files = allow_all_known_files
         
         self._media_callable = media_callable
-        self._page_key = page_key
-        
-        self._hide_favourites_edit_actions = hide_favourites_edit_actions
         
         self._under_construction_or_predicate = None
         
@@ -1405,9 +1375,6 @@ class AutoCompleteDropdownTagsRead( AutoCompleteDropdownTags ):
         self._or_rewind.setToolTip( 'Rewind OR Predicate construction.' )
         self._or_rewind.hide()
         
-        self._include_unusual_predicate_types = include_unusual_predicate_types
-        self._force_system_everything = force_system_everything
-        
         button_hbox_1 = QP.HBoxLayout()
         
         QP.AddToLayout( button_hbox_1, self._include_current_tags, CC.FLAGS_EXPAND_BOTH_WAYS )
@@ -1823,6 +1790,13 @@ class AutoCompleteDropdownTagsRead( AutoCompleteDropdownTags ):
         self._ManageFavouriteSearches( favourite_search_row_to_save = search_row )
         
     
+    def _SetupTopListBox( self ):
+        
+        self._predicates_listbox = ListBoxTagsActiveSearchPredicates( self, self._page_key )
+        
+        QP.AddToLayout( self._main_vbox, self._predicates_listbox, CC.FLAGS_EXPAND_PERPENDICULAR )
+        
+    
     def _StartResultsFetchJob( self, job_key ):
         
         parsed_search_text = self._ParseSearchText()
@@ -1908,6 +1882,11 @@ class AutoCompleteDropdownTagsRead( AutoCompleteDropdownTags ):
         return fsc
         
     
+    def GetPredicates( self ) -> typing.Set[ ClientSearch.Predicate ]:
+        
+        return self._predicates_listbox.GetPredicates()
+        
+    
     def IncludeCurrent( self, page_key, value ):
         
         if page_key == self._page_key:
@@ -1978,6 +1957,157 @@ class AutoCompleteDropdownTagsRead( AutoCompleteDropdownTags ):
             
         
     
+class ListBoxTagsActiveSearchPredicates( ClientGUIListBoxes.ListBoxTagsPredicates ):
+    
+    has_counts = False
+    
+    def __init__( self, parent: AutoCompleteDropdownTagsRead, page_key, initial_predicates = None ):
+        
+        if initial_predicates is None:
+            
+            initial_predicates = []
+            
+        
+        ClientGUIListBoxes.ListBoxTagsPredicates.__init__( self, parent, height_num_chars = 6 )
+        
+        self._my_ac_parent = parent
+        
+        self._page_key = page_key
+        
+        if len( initial_predicates ) > 0:
+            
+            for predicate in initial_predicates:
+                
+                self._AppendTerm( predicate )
+                
+            
+            self._DataHasChanged()
+            
+        
+        HG.client_controller.sub( self, 'EnterPredicates', 'enter_predicates' )
+        
+    
+    def _Activate( self ):
+        
+        if len( self._selected_terms ) > 0:
+            
+            self._EnterPredicates( set( self._selected_terms ) )
+            
+        
+    
+    def _DeleteActivate( self ):
+        
+        self._Activate()
+        
+    
+    def _EnterPredicates( self, predicates, permit_add = True, permit_remove = True ):
+        
+        if len( predicates ) == 0:
+            
+            return
+            
+        
+        predicates_to_be_added = set()
+        predicates_to_be_removed = set()
+        
+        for predicate in predicates:
+            
+            predicate = predicate.GetCountlessCopy()
+            
+            if self._HasPredicate( predicate ):
+                
+                if permit_remove:
+                    
+                    predicates_to_be_removed.add( predicate )
+                    
+                
+            else:
+                
+                if permit_add:
+                    
+                    predicates_to_be_added.add( predicate )
+                    
+                    predicates_to_be_removed.update( self._GetMutuallyExclusivePredicates( predicate ) )
+                    
+                
+            
+        
+        for predicate in predicates_to_be_added:
+            
+            self._AppendTerm( predicate )
+            
+        
+        for predicate in predicates_to_be_removed:
+            
+            self._RemoveTerm( predicate )
+            
+        
+        self._SortByText()
+        
+        self._DataHasChanged()
+        
+        HG.client_controller.pub( 'refresh_query', self._page_key )
+        
+    
+    def _GetCurrentFileServiceKey( self ):
+        
+        return self._my_ac_parent.GetFileSearchContext().GetFileServiceKey()
+        
+    
+    def _GetCurrentPagePredicates( self ) -> typing.Set[ ClientSearch.Predicate ]:
+        
+        return self.GetPredicates()
+        
+    
+    def _GetTextFromTerm( self, term ):
+        
+        predicate = term
+        
+        return predicate.ToString( render_for_user = True )
+        
+    
+    def _ProcessMenuPredicateEvent( self, command ):
+        
+        ( include_predicates, exclude_predicates ) = self._GetSelectedIncludeExcludePredicates()
+        
+        if command == 'add_include_predicates':
+            
+            self._EnterPredicates( include_predicates, permit_remove = False )
+            
+        elif command == 'remove_include_predicates':
+            
+            self._EnterPredicates( include_predicates, permit_add = False )
+            
+        elif command == 'add_exclude_predicates':
+            
+            self._EnterPredicates( exclude_predicates, permit_remove = False )
+            
+        elif command == 'remove_exclude_predicates':
+            
+            self._EnterPredicates( exclude_predicates, permit_add = False )
+            
+        
+    
+    def EnterPredicates( self, page_key, predicates, permit_add = True, permit_remove = True ):
+        
+        if page_key == self._page_key:
+            
+            self._EnterPredicates( predicates, permit_add = permit_add, permit_remove = permit_remove )
+            
+        
+    
+    def SetPredicates( self, predicates ):
+        
+        self._Clear()
+        
+        for predicate in predicates:
+            
+            self._AppendTerm( predicate )
+            
+        
+        self._DataHasChanged()
+        
+    
 class AutoCompleteDropdownTagsWrite( AutoCompleteDropdownTags ):
     
     def __init__( self, parent, chosen_tag_callable, expand_parents, file_service_key, tag_service_key, null_entry_callable = None, tag_service_key_changed_callable = None, show_paste_button = False ):
diff --git a/include/ClientGUICanvas.py b/include/ClientGUICanvas.py
index 13b3f760..fb5cafe0 100755
--- a/include/ClientGUICanvas.py
+++ b/include/ClientGUICanvas.py
@@ -5051,8 +5051,6 @@ class CanvasMediaListBrowser( CanvasMediaListNavigable ):
             self._timer_slideshow_job = HG.client_controller.CallLaterQtSafe( self, self._timer_slideshow_interval, self.DoSlideshow )
             
         
-        self._media_container.SetSlideshowMode( True )
-        
     
     def _StopSlideshow( self ):
         
@@ -5062,7 +5060,7 @@ class CanvasMediaListBrowser( CanvasMediaListNavigable ):
             
             self._timer_slideshow_job = None
             
-            self._media_container.SetSlideshowMode( False )
+            self._media_container.StopForSlideshow( False )
             
         
     
@@ -5070,10 +5068,17 @@ class CanvasMediaListBrowser( CanvasMediaListNavigable ):
         
         try:
             
+            # we are due for a slideshow change, so tell movie to stop for it once it has played once through
+            # if short movie, it has prob played through a lot and will shift immediately
+            # if longer movie, it has prob not played through but will now stop when it has and wait for us to change it then
+            self._media_container.StopForSlideshow( True )
+            
             if self._current_media is not None and self._RunningSlideshow():
                 
                 if self._media_container.ReadyToSlideshow() and not CGC.core().MenuIsOpen():
                     
+                    self._media_container.StopForSlideshow( False )
+                    
                     self._ShowNext()
                     
                     self._timer_slideshow_job = HG.client_controller.CallLaterQtSafe( self, self._timer_slideshow_interval, self.DoSlideshow )
@@ -5183,13 +5188,6 @@ class CanvasMediaListBrowser( CanvasMediaListNavigable ):
         return command_processed
         
     
-    def SetMedia( self, media ):
-        
-        CanvasMediaListNavigable.SetMedia( self, media )
-        
-        self._media_container.SetSlideshowMode( self._RunningSlideshow() )
-        
-    
     def ShowMenu( self ):
         
         if self._current_media is not None:
@@ -5438,8 +5436,6 @@ class MediaContainer( QW.QWidget ):
         self._start_paused = False
         self._start_with_embed = False
         
-        self._slideshow_mode = False
-        
         self._media_window = None
         
         self._embed_button = EmbedButton( self )
@@ -5912,13 +5908,11 @@ class MediaContainer( QW.QWidget ):
         self.hide()
         
     
-    def SetSlideshowMode( self, value ):
-        
-        self._slideshow_mode = value
+    def StopForSlideshow( self, value ):
         
         if isinstance( self._media_window, ( Animation, ClientGUIMPV.mpvWidget ) ):
             
-            self._media_window.StopForSlideshow( self._slideshow_mode )
+            self._media_window.StopForSlideshow( value )
             
         
     
diff --git a/include/ClientGUICommon.py b/include/ClientGUICommon.py
index 7a181567..04833e41 100755
--- a/include/ClientGUICommon.py
+++ b/include/ClientGUICommon.py
@@ -241,11 +241,11 @@ class BetterChoice( QW.QComboBox ):
         
         if selection != -1:
             
-            return QP.GetClientData( self, selection )
+            return self.itemData( selection, QC.Qt.UserRole )
             
         elif self.count() > 0:
             
-            return QP.GetClientData( self, 0 )
+            return self.itemData( 0, QC.Qt.UserRole )
             
         else:
             
@@ -257,7 +257,7 @@ class BetterChoice( QW.QComboBox ):
         
         for i in range( self.count() ):
             
-            if data == QP.GetClientData( self, i ):
+            if data == self.itemData( i, QC.Qt.UserRole ):
                 
                 self.setCurrentIndex( i )
                 
@@ -859,7 +859,7 @@ class ListBook( QW.QWidget ):
         
         for i in range( self._list_box.count() ):
             
-            i_key = QP.GetClientData( self._list_box, i )
+            i_key = self._list_box.item( i ).data( QC.Qt.UserRole )
             
             if i_key == key:
                 
@@ -878,7 +878,7 @@ class ListBook( QW.QWidget ):
             
         else:
             
-            self._current_key = QP.GetClientData( self._list_box, selection )
+            self._current_key = self._list_box.item( selection ).data( QC.Qt.UserRole )
             
         
         self._current_panel.setVisible( False )
@@ -2287,7 +2287,7 @@ class StaticBoxSorterForListBoxTags( StaticBox ):
         
         if selection != -1:
             
-            sort = QP.GetClientData( self._sorter, selection )
+            sort = self._sorter.GetValue()
             
             self._tags_box.SetSort( sort )
             
diff --git a/include/ClientGUIControls.py b/include/ClientGUIControls.py
index 58c1a930..a49c3a52 100644
--- a/include/ClientGUIControls.py
+++ b/include/ClientGUIControls.py
@@ -697,7 +697,7 @@ class EditStringConverterPanel( ClientGUIScrolledPanels.EditPanel ):
             self._data_timezone_encode = ClientGUICommon.BetterChoice( self )
             self._data_timezone_offset = QP.MakeQSpinBox( self, min=-86400, max=86400 )
             
-            for e in ( 'hex', 'base64' ):
+            for e in ( 'hex', 'base64', 'url percent encoding' ):
                 
                 self._data_encoding.addItem( e, e )
                 
diff --git a/include/ClientGUIDialogsQuick.py b/include/ClientGUIDialogsQuick.py
index 78c18c87..3314cdcc 100644
--- a/include/ClientGUIDialogsQuick.py
+++ b/include/ClientGUIDialogsQuick.py
@@ -31,7 +31,7 @@ def GetDeleteFilesJobs( win, media, default_reason, suggested_file_service_key =
             
         else:
             
-            raise HydrusExceptions.CancelledException()
+            raise HydrusExceptions.CancelledException( 'Dialog cancelled.' )
             
         
     
@@ -111,7 +111,7 @@ def SelectFromList( win, title, choice_tuples, value_to_select = None, sort_tupl
             
         else:
             
-            raise HydrusExceptions.CancelledException()
+            raise HydrusExceptions.CancelledException( 'Dialog cancelled.' )
             
         
     
@@ -131,7 +131,7 @@ def SelectFromListButtons( win, title, choice_tuples ):
             
         else:
             
-            raise HydrusExceptions.CancelledException()
+            raise HydrusExceptions.CancelledException( 'Dialog cancelled.' )
             
         
     
diff --git a/include/ClientGUIExport.py b/include/ClientGUIExport.py
index 50cc88ea..af160a17 100644
--- a/include/ClientGUIExport.py
+++ b/include/ClientGUIExport.py
@@ -215,9 +215,7 @@ class EditExportFolderPanel( ClientGUIScrolledPanels.EditPanel ):
         
         self._page_key = 'export folders placeholder'
         
-        self._predicates_box = ClientGUIListBoxes.ListBoxTagsActiveSearchPredicates( self._query_box, self._page_key )
-        
-        self._tag_autocomplete = ClientGUIACDropdown.AutoCompleteDropdownTagsRead( self._query_box, self._predicates_box, self._page_key, file_search_context, allow_all_known_files = False, force_system_everything = True )
+        self._tag_autocomplete = ClientGUIACDropdown.AutoCompleteDropdownTagsRead( self._query_box, self._page_key, file_search_context, allow_all_known_files = False, force_system_everything = True )
         
         #
         
@@ -292,7 +290,6 @@ If you select synchronise, be careful!'''
         
         self._type_box.Add( gridbox, CC.FLAGS_EXPAND_SIZER_PERPENDICULAR )
         
-        self._query_box.Add( self._predicates_box, CC.FLAGS_EXPAND_BOTH_WAYS )
         self._query_box.Add( self._tag_autocomplete )
         
         self._period_box.Add( self._period, CC.FLAGS_EXPAND_PERPENDICULAR )
diff --git a/include/ClientGUIListBoxes.py b/include/ClientGUIListBoxes.py
index ca194660..a5572ddb 100644
--- a/include/ClientGUIListBoxes.py
+++ b/include/ClientGUIListBoxes.py
@@ -19,6 +19,7 @@ from . import HydrusGlobals as HG
 from . import HydrusSerialisable
 from . import HydrusTags
 import os
+import typing
 from qtpy import QtCore as QC
 from qtpy import QtWidgets as QW
 from qtpy import QtGui as QG
@@ -1488,18 +1489,6 @@ class ListBox( QW.QScrollArea ):
         self.widget().update()
         
     
-    def GetClientData( self, index = None ):
-        
-        if index is None:
-            
-            return set( self._terms )
-            
-        else:
-            
-            return self._GetTerm( index )
-            
-        
-    
     def GetIdealHeight( self ):
         
         text_height = self.fontMetrics().height()
@@ -1578,8 +1567,6 @@ class ListBoxTags( ListBox ):
         
         ListBox.__init__( self, *args, **kwargs )
         
-        self._get_current_predicates_callable = None
-        
         self._tag_display_type = ClientTags.TAG_DISPLAY_STORAGE
         
         self._page_key = None # placeholder. if a subclass sets this, it changes menu behaviour to allow 'select this tag' menu pubsubs
@@ -1604,6 +1591,16 @@ class ListBoxTags( ListBox ):
         return texts
         
     
+    def _GetCurrentFileServiceKey( self ):
+        
+        return CC.LOCAL_FILE_SERVICE_KEY
+        
+    
+    def _GetCurrentPagePredicates( self ) -> typing.Optional[ typing.Set[ ClientSearch.Predicate ] ]:
+        
+        return None
+        
+    
     def _GetNamespaceFromTerm( self, term ):
         
         raise NotImplementedError()
@@ -1692,7 +1689,9 @@ class ListBoxTags( ListBox ):
             
             activate_window = HG.client_controller.new_options.GetBoolean( 'activate_window_on_tag_search_page_activation' )
             
-            HG.client_controller.pub( 'new_page_query', CC.LOCAL_FILE_SERVICE_KEY, initial_predicates = predicates, page_name = page_name, activate_window = activate_window )
+            file_service_key = self._GetCurrentFileServiceKey()
+            
+            HG.client_controller.pub( 'new_page_query', file_service_key, initial_predicates = predicates, page_name = page_name, activate_window = activate_window )
             
         
     
@@ -2060,35 +2059,32 @@ class ListBoxTags( ListBox ):
                         
                     
                 
-                if self._get_current_predicates_callable is not None:
+                current_predicates = self._GetCurrentPagePredicates()
+                
+                if current_predicates is not None:
                     
                     ClientGUIMenus.AppendSeparator( menu )
                     
-                    current_predicates = self._get_current_predicates_callable()
+                    ( include_predicates, exclude_predicates ) = self._GetSelectedIncludeExcludePredicates()
                     
-                    if current_predicates is not None:
+                    if True in ( include_predicate in current_predicates for include_predicate in include_predicates ):
                         
-                        ( include_predicates, exclude_predicates ) = self._GetSelectedIncludeExcludePredicates()
+                        ClientGUIMenus.AppendMenuItem( menu, 'discard ' + selection_string + ' from current search', 'Remove the selected predicates from the current search.', self._ProcessMenuPredicateEvent, 'remove_include_predicates' )
                         
-                        if True in ( include_predicate in current_predicates for include_predicate in include_predicates ):
-                            
-                            ClientGUIMenus.AppendMenuItem( menu, 'discard ' + selection_string + ' from current search', 'Remove the selected predicates from the current search.', self._ProcessMenuPredicateEvent, 'remove_include_predicates' )
-                            
+                    
+                    if True in ( include_predicate not in current_predicates for include_predicate in include_predicates ):
                         
-                        if True in ( include_predicate not in current_predicates for include_predicate in include_predicates ):
-                            
-                            ClientGUIMenus.AppendMenuItem( menu, 'require ' + selection_string + ' for current search', 'Add the selected predicates from the current search.', self._ProcessMenuPredicateEvent, 'add_include_predicates' )
-                            
+                        ClientGUIMenus.AppendMenuItem( menu, 'require ' + selection_string + ' for current search', 'Add the selected predicates from the current search.', self._ProcessMenuPredicateEvent, 'add_include_predicates' )
                         
-                        if True in ( exclude_predicate in current_predicates for exclude_predicate in exclude_predicates ):
-                            
-                            ClientGUIMenus.AppendMenuItem( menu, 'permit ' + selection_string + ' for current search', 'Stop disallowing the selected predicates from the current search.', self._ProcessMenuPredicateEvent, 'remove_exclude_predicates' )
-                            
+                    
+                    if True in ( exclude_predicate in current_predicates for exclude_predicate in exclude_predicates ):
                         
-                        if True in ( exclude_predicate not in current_predicates for exclude_predicate in exclude_predicates ):
-                            
-                            ClientGUIMenus.AppendMenuItem( menu, 'exclude ' + selection_string + ' from current search', 'Disallow the selected predicates for the current search.', self._ProcessMenuPredicateEvent, 'add_exclude_predicates' )
-                            
+                        ClientGUIMenus.AppendMenuItem( menu, 'permit ' + selection_string + ' for current search', 'Stop disallowing the selected predicates from the current search.', self._ProcessMenuPredicateEvent, 'remove_exclude_predicates' )
+                        
+                    
+                    if True in ( exclude_predicate not in current_predicates for exclude_predicate in exclude_predicates ):
+                        
+                        ClientGUIMenus.AppendMenuItem( menu, 'exclude ' + selection_string + ' from current search', 'Disallow the selected predicates for the current search.', self._ProcessMenuPredicateEvent, 'add_exclude_predicates' )
                         
                     
                 
@@ -2309,151 +2305,11 @@ class ListBoxTagsPredicates( ListBoxTags ):
             
         
     
-    def GetPredicates( self ):
+    def GetPredicates( self ) -> typing.Set[ ClientSearch.Predicate ]:
         
         return set( self._terms )
         
     
-class ListBoxTagsActiveSearchPredicates( ListBoxTagsPredicates ):
-    
-    has_counts = False
-    
-    def __init__( self, parent, page_key, initial_predicates = None ):
-        
-        if initial_predicates is None:
-            
-            initial_predicates = []
-            
-        
-        ListBoxTagsPredicates.__init__( self, parent, height_num_chars = 6 )
-        
-        self._page_key = page_key
-        self._get_current_predicates_callable = self.GetPredicates
-        
-        if len( initial_predicates ) > 0:
-            
-            for predicate in initial_predicates:
-                
-                self._AppendTerm( predicate )
-                
-            
-            self._DataHasChanged()
-            
-        
-        HG.client_controller.sub( self, 'EnterPredicates', 'enter_predicates' )
-        
-    
-    def _Activate( self ):
-        
-        if len( self._selected_terms ) > 0:
-            
-            self._EnterPredicates( set( self._selected_terms ) )
-            
-        
-    
-    def _DeleteActivate( self ):
-        
-        self._Activate()
-        
-    
-    def _EnterPredicates( self, predicates, permit_add = True, permit_remove = True ):
-        
-        if len( predicates ) == 0:
-            
-            return
-            
-        
-        predicates_to_be_added = set()
-        predicates_to_be_removed = set()
-        
-        for predicate in predicates:
-            
-            predicate = predicate.GetCountlessCopy()
-            
-            if self._HasPredicate( predicate ):
-                
-                if permit_remove:
-                    
-                    predicates_to_be_removed.add( predicate )
-                    
-                
-            else:
-                
-                if permit_add:
-                    
-                    predicates_to_be_added.add( predicate )
-                    
-                    predicates_to_be_removed.update( self._GetMutuallyExclusivePredicates( predicate ) )
-                    
-                
-            
-        
-        for predicate in predicates_to_be_added:
-            
-            self._AppendTerm( predicate )
-            
-        
-        for predicate in predicates_to_be_removed:
-            
-            self._RemoveTerm( predicate )
-            
-        
-        self._SortByText()
-        
-        self._DataHasChanged()
-        
-        HG.client_controller.pub( 'refresh_query', self._page_key )
-        
-    
-    def _GetTextFromTerm( self, term ):
-        
-        predicate = term
-        
-        return predicate.ToString( render_for_user = True )
-        
-    
-    def _ProcessMenuPredicateEvent( self, command ):
-        
-        ( include_predicates, exclude_predicates ) = self._GetSelectedIncludeExcludePredicates()
-        
-        if command == 'add_include_predicates':
-            
-            self._EnterPredicates( include_predicates, permit_remove = False )
-            
-        elif command == 'remove_include_predicates':
-            
-            self._EnterPredicates( include_predicates, permit_add = False )
-            
-        elif command == 'add_exclude_predicates':
-            
-            self._EnterPredicates( exclude_predicates, permit_remove = False )
-            
-        elif command == 'remove_exclude_predicates':
-            
-            self._EnterPredicates( exclude_predicates, permit_add = False )
-            
-        
-    
-    def EnterPredicates( self, page_key, predicates, permit_add = True, permit_remove = True ):
-        
-        if page_key == self._page_key:
-            
-            self._EnterPredicates( predicates, permit_add = permit_add, permit_remove = permit_remove )
-            
-        
-    
-    def SetPredicates( self, predicates ):
-        
-        self._Clear()
-        
-        for predicate in predicates:
-            
-            self._AppendTerm( predicate )
-            
-        
-        self._DataHasChanged()
-        
-    
 class ListBoxTagsAC( ListBoxTagsPredicates ):
     
     def __init__( self, parent, callable, service_key, float_mode, **kwargs ):
@@ -3331,78 +3187,6 @@ class ListBoxTagsSelectionHoverFrame( ListBoxTagsSelection ):
         HG.client_controller.pub( 'canvas_manage_tags', self._canvas_key )
         
     
-class ListBoxTagsSelectionManagementPanel( ListBoxTagsSelection ):
-    
-    def __init__( self, parent, page_key, tag_display_type, predicates_callable = None ):
-        
-        ListBoxTagsSelection.__init__( self, parent, tag_display_type, include_counts = True )
-        
-        self._minimum_height_num_chars = 15
-        
-        self._page_key = page_key
-        self._get_current_predicates_callable = predicates_callable
-        
-        HG.client_controller.sub( self, 'IncrementTagsByMediaPubsub', 'increment_tags_selection' )
-        HG.client_controller.sub( self, 'SetTagsByMediaPubsub', 'new_tags_selection' )
-        HG.client_controller.sub( self, 'ChangeTagServicePubsub', 'change_tag_service' )
-        
-    
-    def _Activate( self ):
-        
-        predicates = [ ClientSearch.Predicate( ClientSearch.PREDICATE_TYPE_TAG, term ) for term in self._selected_terms ]
-        
-        if len( predicates ) > 0:
-            
-            HG.client_controller.pub( 'enter_predicates', self._page_key, predicates )
-            
-        
-    
-    def _ProcessMenuPredicateEvent( self, command ):
-        
-        ( include_predicates, exclude_predicates ) = self._GetSelectedIncludeExcludePredicates()
-        
-        if command == 'add_include_predicates':
-            
-            HG.client_controller.pub( 'enter_predicates', self._page_key, include_predicates, permit_remove = False )
-            
-        elif command == 'remove_include_predicates':
-            
-            HG.client_controller.pub( 'enter_predicates', self._page_key, include_predicates, permit_add = False )
-            
-        elif command == 'add_exclude_predicates':
-            
-            HG.client_controller.pub( 'enter_predicates', self._page_key, exclude_predicates, permit_remove = False )
-            
-        elif command == 'remove_exclude_predicates':
-            
-            HG.client_controller.pub( 'enter_predicates', self._page_key, exclude_predicates, permit_add = False )
-            
-        
-    
-    def ChangeTagServicePubsub( self, page_key, service_key ):
-        
-        if page_key == self._page_key:
-            
-            self.ChangeTagService( service_key )
-            
-        
-    
-    def IncrementTagsByMediaPubsub( self, page_key, media ):
-        
-        if page_key == self._page_key:
-            
-            self.IncrementTagsByMedia( media )
-            
-        
-    
-    def SetTagsByMediaPubsub( self, page_key, media, force_reload = False ):
-        
-        if page_key == self._page_key:
-            
-            self.SetTagsByMedia( media, force_reload = force_reload )
-            
-        
-    
 class ListBoxTagsSelectionTagsDialog( ListBoxTagsSelection ):
     
     render_for_user = False
diff --git a/include/ClientGUIMPV.py b/include/ClientGUIMPV.py
index 2af7bba5..fa42e4b8 100644
--- a/include/ClientGUIMPV.py
+++ b/include/ClientGUIMPV.py
@@ -12,6 +12,7 @@ from qtpy import QtCore as QC
 from qtpy import QtWidgets as QW
 from . import QtPorting as QP
 import locale
+import os
 import traceback
 
 mpv_failed_reason = 'MPV seems ok!'
@@ -462,7 +463,23 @@ class mpvWidget( QW.QWidget ):
     
     def UpdateConf( self ):
         
-        mpv_config_path = HydrusPaths.ConvertPortablePathToAbsPath( HG.client_controller.new_options.GetString( 'mpv_conf_path_portable' ) )
+        mpv_config_path = HG.client_controller.GetMPVConfPath()
+        
+        if not os.path.exists( mpv_config_path ):
+            
+            default_mpv_config_path = HG.client_controller.GetDefaultMPVConfPath()
+            
+            if not os.path.exists( default_mpv_config_path ):
+                
+                HydrusData.ShowText( 'There is no default mpv configuration file to load! Perhaps there is a problem with your install?' )
+                
+                return
+                
+            else:
+                
+                HydrusPaths.MirrorFile( default_mpv_config_path, mpv_config_path )
+                
+            
         
         #To load an existing config file (by default it doesn't load the user/global config like standalone mpv does):
         if hasattr( mpv, '_mpv_load_config_file' ):
@@ -480,7 +497,7 @@ class mpvWidget( QW.QWidget ):
             
         else:
             
-            HydrusData.Print( 'Was unable to load mpv.conf--has the API changed?' )
+            HydrusData.Print( 'Was unable to load mpv.conf--has the MPV API changed?' )
             
         
     
diff --git a/include/ClientGUIManagement.py b/include/ClientGUIManagement.py
index 197cfde2..6a3f189f 100755
--- a/include/ClientGUIManagement.py
+++ b/include/ClientGUIManagement.py
@@ -43,6 +43,7 @@ import os
 import random
 import time
 import traceback
+import typing
 from . import QtPorting as QP
 from qtpy import QtCore as QC
 from qtpy import QtWidgets as QW
@@ -665,6 +666,96 @@ class ManagementController( HydrusSerialisable.SerialisableBase ):
     
 HydrusSerialisable.SERIALISABLE_TYPES_TO_OBJECT_TYPES[ HydrusSerialisable.SERIALISABLE_TYPE_MANAGEMENT_CONTROLLER ] = ManagementController
 
+class ListBoxTagsSelectionManagementPanel( ClientGUIListBoxes.ListBoxTagsSelection ):
+    
+    def __init__( self, parent, management_controller: ManagementController, page_key, tag_display_type, tag_autocomplete: typing.Optional[ ClientGUIACDropdown.AutoCompleteDropdownTagsRead ] = None ):
+        
+        ClientGUIListBoxes.ListBoxTagsSelection.__init__( self, parent, tag_display_type, include_counts = True )
+        
+        self._management_controller = management_controller
+        self._minimum_height_num_chars = 15
+        
+        self._page_key = page_key
+        self._tag_autocomplete = tag_autocomplete
+        
+        HG.client_controller.sub( self, 'IncrementTagsByMediaPubsub', 'increment_tags_selection' )
+        HG.client_controller.sub( self, 'SetTagsByMediaPubsub', 'new_tags_selection' )
+        HG.client_controller.sub( self, 'ChangeTagServicePubsub', 'change_tag_service' )
+        
+    
+    def _Activate( self ):
+        
+        predicates = [ ClientSearch.Predicate( ClientSearch.PREDICATE_TYPE_TAG, term ) for term in self._selected_terms ]
+        
+        if len( predicates ) > 0:
+            
+            HG.client_controller.pub( 'enter_predicates', self._page_key, predicates )
+            
+        
+    
+    def _GetCurrentFileServiceKey( self ):
+        
+        return self._management_controller.GetKey( 'file_service' )
+        
+    
+    def _GetCurrentPagePredicates( self ) -> typing.Optional[ typing.Set[ ClientSearch.Predicate ] ]:
+        
+        if self._tag_autocomplete is None:
+            
+            return None
+            
+        else:
+            
+            return self._tag_autocomplete.GetPredicates()
+            
+        
+    
+    def _ProcessMenuPredicateEvent( self, command ):
+        
+        ( include_predicates, exclude_predicates ) = self._GetSelectedIncludeExcludePredicates()
+        
+        if command == 'add_include_predicates':
+            
+            HG.client_controller.pub( 'enter_predicates', self._page_key, include_predicates, permit_remove = False )
+            
+        elif command == 'remove_include_predicates':
+            
+            HG.client_controller.pub( 'enter_predicates', self._page_key, include_predicates, permit_add = False )
+            
+        elif command == 'add_exclude_predicates':
+            
+            HG.client_controller.pub( 'enter_predicates', self._page_key, exclude_predicates, permit_remove = False )
+            
+        elif command == 'remove_exclude_predicates':
+            
+            HG.client_controller.pub( 'enter_predicates', self._page_key, exclude_predicates, permit_add = False )
+            
+        
+    
+    def ChangeTagServicePubsub( self, page_key, service_key ):
+        
+        if page_key == self._page_key:
+            
+            self.ChangeTagService( service_key )
+            
+        
+    
+    def IncrementTagsByMediaPubsub( self, page_key, media ):
+        
+        if page_key == self._page_key:
+            
+            self.IncrementTagsByMedia( media )
+            
+        
+    
+    def SetTagsByMediaPubsub( self, page_key, media, force_reload = False ):
+        
+        if page_key == self._page_key:
+            
+            self.SetTagsByMedia( media, force_reload = force_reload )
+            
+        
+    
 def managementScrollbarValueChanged( value ):
     
     HG.client_controller.pub( 'top_level_window_move_event' )
@@ -727,7 +818,7 @@ class ManagementPanel( QW.QScrollArea ):
         
         tags_box = ClientGUICommon.StaticBoxSorterForListBoxTags( self, 'selection tags' )
         
-        t = ClientGUIListBoxes.ListBoxTagsSelectionManagementPanel( tags_box, self._page_key, self.TAG_DISPLAY_TYPE )
+        t = ListBoxTagsSelectionManagementPanel( tags_box, self._management_controller, self._page_key, self.TAG_DISPLAY_TYPE )
         
         tags_box.SetTagsBox( t )
         
@@ -896,9 +987,7 @@ class ManagementPanelDuplicateFilter( ManagementPanel ):
         
         file_search_context = management_controller.GetVariable( 'file_search_context' )
         
-        self._active_predicates_box = ClientGUIListBoxes.ListBoxTagsActiveSearchPredicates( self._filtering_panel, self._page_key )
-        
-        self._ac_read = ClientGUIACDropdown.AutoCompleteDropdownTagsRead( self._filtering_panel, self._active_predicates_box, self._page_key, file_search_context, media_sort_widget = self._media_sort, media_collect_widget = self._media_collect, allow_all_known_files = False, force_system_everything = True )
+        self._tag_autocomplete = ClientGUIACDropdown.AutoCompleteDropdownTagsRead( self._filtering_panel, self._page_key, file_search_context, media_sort_widget = self._media_sort, media_collect_widget = self._media_collect, allow_all_known_files = False, force_system_everything = True )
         
         self._both_files_match = QW.QCheckBox( self._filtering_panel )
         
@@ -984,8 +1073,7 @@ class ManagementPanelDuplicateFilter( ManagementPanel ):
         
         gridbox = ClientGUICommon.WrapInGrid( self._filtering_panel, rows )
         
-        self._filtering_panel.Add( self._active_predicates_box, CC.FLAGS_EXPAND_PERPENDICULAR )
-        self._filtering_panel.Add( self._ac_read, CC.FLAGS_EXPAND_PERPENDICULAR )
+        self._filtering_panel.Add( self._tag_autocomplete, CC.FLAGS_EXPAND_PERPENDICULAR )
         self._filtering_panel.Add( gridbox, CC.FLAGS_EXPAND_SIZER_PERPENDICULAR )
         self._filtering_panel.Add( text_and_button_hbox, CC.FLAGS_EXPAND_PERPENDICULAR )
         self._filtering_panel.Add( self._launch_filter, CC.FLAGS_EXPAND_PERPENDICULAR )
@@ -1040,7 +1128,7 @@ class ManagementPanelDuplicateFilter( ManagementPanel ):
     
     def _GetFileSearchContextAndBothFilesMatch( self ):
         
-        file_search_context = self._ac_read.GetFileSearchContext()
+        file_search_context = self._tag_autocomplete.GetFileSearchContext()
         
         both_files_match = self._both_files_match.isChecked()
         
@@ -1163,7 +1251,7 @@ class ManagementPanelDuplicateFilter( ManagementPanel ):
         
         self._UpdateBothFilesMatchButton()
         
-        if self._ac_read.IsSynchronised():
+        if self._tag_autocomplete.IsSynchronised():
             
             self._dupe_count_numbers_dirty = True
             
@@ -3636,6 +3724,10 @@ class ManagementPanelPetitions( ManagementPanel ):
         self._contents.setSelectionMode( QW.QAbstractItemView.ExtendedSelection )
         self._contents.itemDoubleClicked.connect( self.EventContentDoubleClick )
         
+        ( min_width, min_height ) = ClientGUIFunctions.ConvertTextToPixels( self._contents, ( 16, 20 ) )
+        
+        self._contents.setMinimumHeight( min_height )
+        
         self._process = QW.QPushButton( 'process', self._petition_panel )
         self._process.clicked.connect( self.EventProcess )
         self._process.setObjectName( 'HydrusAccept' )
@@ -4232,6 +4324,8 @@ class ManagementPanelPetitions( ManagementPanel ):
         
         QW.QMessageBox.warning( self, 'Warning', 'modify users does not work yet!' )
         
+        return
+        
         with ClientGUIDialogs.DialogModifyAccounts( self, self._petition_service_key, ( self._current_petition.GetPetitionerAccount(), ) ) as dlg:
             
             dlg.exec()
@@ -4336,11 +4430,9 @@ class ManagementPanelQuery( ManagementPanel ):
             
             self._search_panel = ClientGUICommon.StaticBox( self, 'search' )
             
-            self._current_predicates_box = ClientGUIListBoxes.ListBoxTagsActiveSearchPredicates( self._search_panel, self._page_key )
-            
             synchronised = self._management_controller.GetVariable( 'synchronised' )
             
-            self._searchbox = ClientGUIACDropdown.AutoCompleteDropdownTagsRead( self._search_panel, self._current_predicates_box, self._page_key, file_search_context, media_sort_widget = self._media_sort, media_collect_widget = self._media_collect, media_callable = self._page.GetMedia, synchronised = synchronised )
+            self._tag_autocomplete = ClientGUIACDropdown.AutoCompleteDropdownTagsRead( self._search_panel, self._page_key, file_search_context, media_sort_widget = self._media_sort, media_collect_widget = self._media_collect, media_callable = self._page.GetMedia, synchronised = synchronised )
             
             self._cancel_search_button = ClientGUICommon.BetterBitmapButton( self._search_panel, CC.global_pixmaps().stop, self._CancelSearch )
             
@@ -4348,10 +4440,9 @@ class ManagementPanelQuery( ManagementPanel ):
             
             hbox = QP.HBoxLayout()
             
-            QP.AddToLayout( hbox, self._searchbox, CC.FLAGS_EXPAND_BOTH_WAYS )
+            QP.AddToLayout( hbox, self._tag_autocomplete, CC.FLAGS_EXPAND_BOTH_WAYS )
             QP.AddToLayout( hbox, self._cancel_search_button, CC.FLAGS_VCENTER )
             
-            self._search_panel.Add( self._current_predicates_box, CC.FLAGS_EXPAND_BOTH_WAYS )
             self._search_panel.Add( hbox, CC.FLAGS_EXPAND_SIZER_PERPENDICULAR )
             
         
@@ -4387,7 +4478,7 @@ class ManagementPanelQuery( ManagementPanel ):
         
         if self._search_enabled:
             
-            t = ClientGUIListBoxes.ListBoxTagsSelectionManagementPanel( tags_box, self._page_key, self.TAG_DISPLAY_TYPE, predicates_callable = self._current_predicates_box.GetPredicates )
+            t = ListBoxTagsSelectionManagementPanel( tags_box, self._management_controller, self._page_key, self.TAG_DISPLAY_TYPE, tag_autocomplete = self._tag_autocomplete )
             
             file_search_context = self._management_controller.GetVariable( 'file_search_context' )
             
@@ -4397,7 +4488,7 @@ class ManagementPanelQuery( ManagementPanel ):
             
         else:
             
-            t = ClientGUIListBoxes.ListBoxTagsSelectionManagementPanel( tags_box, self._page_key, self.TAG_DISPLAY_TYPE )
+            t = ListBoxTagsSelectionManagementPanel( tags_box, self._management_controller, self._page_key, self.TAG_DISPLAY_TYPE )
             
         
         tags_box.SetTagsBox( t )
@@ -4415,7 +4506,7 @@ class ManagementPanelQuery( ManagementPanel ):
             
             if self._management_controller.GetVariable( 'synchronised' ):
                 
-                file_search_context = self._searchbox.GetFileSearchContext()
+                file_search_context = self._tag_autocomplete.GetFileSearchContext()
                 
                 self._management_controller.SetVariable( 'file_search_context', file_search_context )
                 
@@ -4478,7 +4569,7 @@ class ManagementPanelQuery( ManagementPanel ):
             
             if do_layout:
                 
-                self._searchbox.ForceSizeCalcNow()
+                self._tag_autocomplete.ForceSizeCalcNow()
                 
             
         
@@ -4497,7 +4588,7 @@ class ManagementPanelQuery( ManagementPanel ):
         
         if self._search_enabled:
             
-            self._searchbox.CancelCurrentResultsFetchJob()
+            self._tag_autocomplete.CancelCurrentResultsFetchJob()
             
         
         self._query_job_key.Cancel()
@@ -4509,7 +4600,7 @@ class ManagementPanelQuery( ManagementPanel ):
         
         if self._search_enabled:
             
-            self._searchbox.CancelCurrentResultsFetchJob()
+            self._tag_autocomplete.CancelCurrentResultsFetchJob()
             
         
         self._query_job_key.Cancel()
@@ -4519,7 +4610,7 @@ class ManagementPanelQuery( ManagementPanel ):
         
         if self._search_enabled:
             
-            return self._current_predicates_box.GetPredicates()
+            return self._tag_autocomplete.GetPredicates()
             
         else:
             
@@ -4549,7 +4640,7 @@ class ManagementPanelQuery( ManagementPanel ):
         
         if self._search_enabled:
             
-            HG.client_controller.CallAfterQtSafe( self._searchbox, self._searchbox.setFocus, QC.Qt.OtherFocusReason)
+            HG.client_controller.CallAfterQtSafe( self._tag_autocomplete, self._tag_autocomplete.setFocus, QC.Qt.OtherFocusReason)
             
         
     
diff --git a/include/ClientGUIPages.py b/include/ClientGUIPages.py
index c30099d7..98c93f72 100755
--- a/include/ClientGUIPages.py
+++ b/include/ClientGUIPages.py
@@ -1111,6 +1111,8 @@ class PagesNotebook( QP.TabWidgetWithDnD ):
         
         session.AddPageTuple( page )
         
+        session = session.Duplicate() # this ensures we are using fresh new objects
+        
         self.InsertSessionPageTuples( index + 1, session.GetPageTuples() )
         
     
@@ -2621,6 +2623,11 @@ class PagesNotebook( QP.TabWidgetWithDnD ):
             tag_service_key = CC.COMBINED_TAG_SERVICE_KEY
             
         
+        if file_service_key == CC.COMBINED_FILE_SERVICE_KEY and tag_service_key == CC.COMBINED_TAG_SERVICE_KEY:
+            
+            tag_service_key = CC.COMBINED_LOCAL_FILE_SERVICE_KEY
+            
+        
         tag_search_context = ClientSearch.TagSearchContext( service_key = tag_service_key )
         
         file_search_context = ClientSearch.FileSearchContext( file_service_key = file_service_key, tag_search_context = tag_search_context, predicates = initial_predicates )
diff --git a/include/ClientGUIPanels.py b/include/ClientGUIPanels.py
index 08d5da34..1fb6944f 100644
--- a/include/ClientGUIPanels.py
+++ b/include/ClientGUIPanels.py
@@ -827,9 +827,9 @@ class ReviewServicePanel( QW.QWidget ):
             
             self._my_updater = ClientGUIAsync.FastThreadToGUIUpdater( self, self._Refresh )
             
-            self._address = ClientGUICommon.BetterStaticText( self )
-            self._functional = ClientGUICommon.BetterStaticText( self )
-            self._bandwidth_summary = ClientGUICommon.BetterStaticText( self )
+            self._address = ClientGUICommon.BetterStaticText( self, ellipsize_end = True )
+            self._functional = ClientGUICommon.BetterStaticText( self, ellipsize_end = True )
+            self._bandwidth_summary = ClientGUICommon.BetterStaticText( self, ellipsize_end = True )
             
             self._bandwidth_panel = QW.QWidget( self )
             
@@ -920,10 +920,10 @@ class ReviewServicePanel( QW.QWidget ):
             
             self._my_updater = ClientGUIAsync.FastThreadToGUIUpdater( self, self._Refresh )
             
-            self._title_and_expires_st = ClientGUICommon.BetterStaticText( self )
-            self._status_st = ClientGUICommon.BetterStaticText( self )
-            self._next_sync_st = ClientGUICommon.BetterStaticText( self )
-            self._bandwidth_summary = ClientGUICommon.BetterStaticText( self )
+            self._title_and_expires_st = ClientGUICommon.BetterStaticText( self, ellipsize_end = True )
+            self._status_st = ClientGUICommon.BetterStaticText( self, ellipsize_end = True )
+            self._next_sync_st = ClientGUICommon.BetterStaticText( self, ellipsize_end = True )
+            self._bandwidth_summary = ClientGUICommon.BetterStaticText( self, ellipsize_end = True )
             
             self._bandwidth_panel = QW.QWidget( self )
             
diff --git a/include/ClientGUIScrolledPanelsManagement.py b/include/ClientGUIScrolledPanelsManagement.py
index ae328218..fe4ad661 100644
--- a/include/ClientGUIScrolledPanelsManagement.py
+++ b/include/ClientGUIScrolledPanelsManagement.py
@@ -3284,7 +3284,7 @@ class ManageOptionsPanel( ClientGUIScrolledPanels.ManagePanel ):
             self._media_zooms = QW.QLineEdit( self )
             self._media_zooms.textChanged.connect( self.EventZoomsChanged )
             
-            self._mpv_conf_path = QP.FilePickerCtrl( self )
+            self._mpv_conf_path = QP.FilePickerCtrl( self, starting_directory = os.path.join( HC.STATIC_DIR, 'mpv-conf' ) )
             
             self._animated_scanbar_height = QP.MakeQSpinBox( self, min=1, max=255 )
             self._animated_scanbar_nub_width = QP.MakeQSpinBox( self, min=1, max=63 )
@@ -3311,7 +3311,6 @@ class ManageOptionsPanel( ClientGUIScrolledPanels.ManagePanel ):
             self._media_viewer_cursor_autohide_time_ms.SetValue( self._new_options.GetNoneableInteger( 'media_viewer_cursor_autohide_time_ms' ) )
             self._anchor_and_hide_canvas_drags.setChecked( self._new_options.GetBoolean( 'anchor_and_hide_canvas_drags' ) )
             self._touchscreen_canvas_drags_unanchor.setChecked( self._new_options.GetBoolean( 'touchscreen_canvas_drags_unanchor' ) )
-            self._mpv_conf_path.SetPath( HydrusPaths.ConvertPortablePathToAbsPath( self._new_options.GetString( 'mpv_conf_path_portable' ) ) )
             self._animated_scanbar_height.setValue( self._new_options.GetInteger( 'animated_scanbar_height' ) )
             self._animated_scanbar_nub_width.setValue( self._new_options.GetInteger( 'animated_scanbar_nub_width' ) )
             
@@ -3340,7 +3339,7 @@ class ManageOptionsPanel( ClientGUIScrolledPanels.ManagePanel ):
             rows.append( ( 'Prefer system FFMPEG:', self._use_system_ffmpeg ) )
             rows.append( ( 'Always Loop GIFs:', self._always_loop_gifs ) )
             rows.append( ( 'Media zooms:', self._media_zooms ) )
-            rows.append( ( 'MPV conf path:', self._mpv_conf_path ) )
+            rows.append( ( 'Set a new mpv.conf on dialog ok?:', self._mpv_conf_path ) )
             rows.append( ( 'Animation scanbar height:', self._animated_scanbar_height ) )
             rows.append( ( 'Animation scanbar nub width:', self._animated_scanbar_nub_width ) )
             rows.append( ( 'Time until mouse cursor autohides on media viewer:', self._media_viewer_cursor_autohide_time_ms ) )
@@ -3570,7 +3569,22 @@ class ManageOptionsPanel( ClientGUIScrolledPanels.ManagePanel ):
             
             self._new_options.SetNoneableInteger( 'media_viewer_cursor_autohide_time_ms', self._media_viewer_cursor_autohide_time_ms.GetValue() )
             
-            self._new_options.SetString( 'mpv_conf_path_portable', HydrusPaths.ConvertAbsPathToPortablePath( self._mpv_conf_path.GetPath() ) )
+            mpv_conf_path = self._mpv_conf_path.GetPath()
+            
+            if mpv_conf_path is not None and mpv_conf_path != '' and os.path.exists( mpv_conf_path ) and os.path.isfile( mpv_conf_path ):
+                
+                dest_mpv_conf_path = HG.client_controller.GetMPVConfPath()
+                
+                try:
+                    
+                    HydrusPaths.MirrorFile( mpv_conf_path, dest_mpv_conf_path )
+                    
+                except Exception as e:
+                    
+                    HydrusData.ShowText( 'Could not set the mpv conf path "{}" to "{}"! Error follows!'.format( mpv_conf_path, dest_mpv_conf_path ) )
+                    HydrusData.ShowException( e )
+                    
+                
             
             self._new_options.SetInteger( 'animated_scanbar_height', self._animated_scanbar_height.value() )
             self._new_options.SetInteger( 'animated_scanbar_nub_width', self._animated_scanbar_nub_width.value() )
diff --git a/include/ClientGUIScrolledPanelsReview.py b/include/ClientGUIScrolledPanelsReview.py
index ae44dcd6..2656f9cd 100644
--- a/include/ClientGUIScrolledPanelsReview.py
+++ b/include/ClientGUIScrolledPanelsReview.py
@@ -2505,11 +2505,9 @@ class ReviewFileMaintenance( ClientGUIScrolledPanels.ReviewPanel ):
         
         page_key = HydrusData.GenerateKey()
         
-        self._current_predicates_box = ClientGUIListBoxes.ListBoxTagsActiveSearchPredicates( self._search_panel, page_key )
-        
         file_search_context = ClientSearch.FileSearchContext( file_service_key = CC.LOCAL_FILE_SERVICE_KEY )
         
-        self._tag_ac_input = ClientGUIACDropdown.AutoCompleteDropdownTagsRead( self._search_panel, self._current_predicates_box, page_key, file_search_context, allow_all_known_files = False, force_system_everything = True )
+        self._tag_autocomplete = ClientGUIACDropdown.AutoCompleteDropdownTagsRead( self._search_panel, page_key, file_search_context, allow_all_known_files = False, force_system_everything = True )
         
         self._run_search_st = ClientGUICommon.BetterStaticText( self._search_panel, label = 'no results yet' )
         
@@ -2520,8 +2518,7 @@ class ReviewFileMaintenance( ClientGUIScrolledPanels.ReviewPanel ):
         QP.AddToLayout( hbox, self._run_search_st, CC.FLAGS_EXPAND_BOTH_WAYS )
         QP.AddToLayout( hbox, self._run_search, CC.FLAGS_VCENTER )
         
-        self._search_panel.Add( self._current_predicates_box, CC.FLAGS_EXPAND_BOTH_WAYS )
-        self._search_panel.Add( self._tag_ac_input, CC.FLAGS_EXPAND_PERPENDICULAR )
+        self._search_panel.Add( self._tag_autocomplete, CC.FLAGS_EXPAND_PERPENDICULAR )
         self._search_panel.Add( hbox, CC.FLAGS_EXPAND_SIZER_PERPENDICULAR )
         
         #
@@ -2762,7 +2759,7 @@ class ReviewFileMaintenance( ClientGUIScrolledPanels.ReviewPanel ):
         
         self._run_search.setEnabled( False )
         
-        file_search_context = self._tag_ac_input.GetFileSearchContext()
+        file_search_context = self._tag_autocomplete.GetFileSearchContext()
         
         HG.client_controller.CallToThread( do_it, file_search_context )
         
diff --git a/include/ClientGUISearchPanels.py b/include/ClientGUISearchPanels.py
index 5dfffaf0..18035bbe 100644
--- a/include/ClientGUISearchPanels.py
+++ b/include/ClientGUISearchPanels.py
@@ -37,9 +37,7 @@ class EditFavouriteSearchPanel( ClientGUIScrolledPanels.EditPanel ):
         from . import ClientGUIACDropdown
         from . import ClientGUIListBoxes
         
-        self._predicates_box = ClientGUIListBoxes.ListBoxTagsActiveSearchPredicates( self, page_key )
-        
-        self._searchbox = ClientGUIACDropdown.AutoCompleteDropdownTagsRead( self, self._predicates_box, page_key, file_search_context, media_sort_widget = self._media_sort, media_collect_widget = self._media_collect, synchronised = synchronised, hide_favourites_edit_actions = True )
+        self._tag_autocomplete = ClientGUIACDropdown.AutoCompleteDropdownTagsRead( self, page_key, file_search_context, media_sort_widget = self._media_sort, media_collect_widget = self._media_collect, synchronised = synchronised, hide_favourites_edit_actions = True )
         
         self._include_media_sort = QW.QCheckBox( self )
         self._include_media_collect = QW.QCheckBox( self )
@@ -95,8 +93,7 @@ class EditFavouriteSearchPanel( ClientGUIScrolledPanels.EditPanel ):
         vbox = QP.VBoxLayout()
         
         QP.AddToLayout( vbox, top_gridbox, CC.FLAGS_EXPAND_SIZER_PERPENDICULAR )
-        QP.AddToLayout( vbox, self._predicates_box, CC.FLAGS_EXPAND_PERPENDICULAR )
-        QP.AddToLayout( vbox, self._searchbox, CC.FLAGS_EXPAND_PERPENDICULAR )
+        QP.AddToLayout( vbox, self._tag_autocomplete, CC.FLAGS_EXPAND_PERPENDICULAR )
         QP.AddToLayout( vbox, bottom_gridbox, CC.FLAGS_EXPAND_SIZER_PERPENDICULAR )
         
         self.widget().setLayout( vbox )
@@ -150,8 +147,8 @@ class EditFavouriteSearchPanel( ClientGUIScrolledPanels.EditPanel ):
         
         name = self._name.text()
         
-        file_search_context = self._searchbox.GetFileSearchContext()
-        synchronised = self._searchbox.IsSynchronised()
+        file_search_context = self._tag_autocomplete.GetFileSearchContext()
+        synchronised = self._tag_autocomplete.IsSynchronised()
         
         if self._include_media_sort.isChecked():
             
diff --git a/include/ClientGUITags.py b/include/ClientGUITags.py
index 078f6fdb..0d6d5744 100644
--- a/include/ClientGUITags.py
+++ b/include/ClientGUITags.py
@@ -161,6 +161,12 @@ class EditTagFilterPanel( ClientGUIScrolledPanels.EditPanel ):
         self._prefer_blacklist = prefer_blacklist
         self._namespaces = namespaces
         
+        self._wildcard_replacements = {}
+        
+        self._wildcard_replacements[ '*' ] = ''
+        self._wildcard_replacements[ '*:' ] = ':'
+        self._wildcard_replacements[ '*:*' ] = ':'
+        
         #
         
         help_button = ClientGUICommon.BetterBitmapButton( self, CC.global_pixmaps().help, self._ShowHelp )
@@ -261,7 +267,9 @@ class EditTagFilterPanel( ClientGUIScrolledPanels.EditPanel ):
     
     def _AdvancedAddBlacklist( self, tag_slice ):
         
-        if tag_slice in self._advanced_blacklist.GetClientData():
+        tag_slice = self._CleanTagSliceInput( tag_slice )
+        
+        if tag_slice in self._advanced_blacklist.GetTags():
             
             self._advanced_blacklist.RemoveTags( ( tag_slice, ) )
             
@@ -299,7 +307,9 @@ class EditTagFilterPanel( ClientGUIScrolledPanels.EditPanel ):
     
     def _AdvancedAddWhitelist( self, tag_slice ):
         
-        if tag_slice in self._advanced_whitelist.GetClientData():
+        tag_slice = self._CleanTagSliceInput( tag_slice )
+        
+        if tag_slice in self._advanced_whitelist.GetTags():
             
             self._advanced_whitelist.RemoveTags( ( tag_slice, ) )
             
@@ -382,6 +392,31 @@ class EditTagFilterPanel( ClientGUIScrolledPanels.EditPanel ):
         self._UpdateStatus()
         
     
+    def _CleanTagSliceInput( self, tag_slice ):
+        
+        while '**' in tag_slice:
+            
+            tag_slice = tag_slice.replace( '**', '*' )
+            
+        
+        if tag_slice in self._wildcard_replacements:
+            
+            tag_slice = self._wildcard_replacements[ tag_slice ]
+            
+        
+        if ':' in tag_slice:
+            
+            ( namespace, subtag ) = HydrusTags.SplitTag( tag_slice )
+            
+            if subtag == '*':
+                
+                tag_slice = '{}:'.format( namespace )
+                
+            
+        
+        return tag_slice
+        
+    
     def _CurrentlyBlocked( self, tag_slice ):
         
         if tag_slice in ( '', ':' ):
@@ -403,7 +438,7 @@ class EditTagFilterPanel( ClientGUIScrolledPanels.EditPanel ):
             test_slices = { '', tag_slice }
             
         
-        blacklist = set( self._advanced_blacklist.GetClientData() )
+        blacklist = set( self._advanced_blacklist.GetTags() )
         
         return not blacklist.isdisjoint( test_slices )
         
@@ -473,8 +508,8 @@ class EditTagFilterPanel( ClientGUIScrolledPanels.EditPanel ):
     
     def _GetWhiteBlacklistsPossible( self ):
         
-        blacklist_tag_slices = self._advanced_blacklist.GetClientData()
-        whitelist_tag_slices = self._advanced_whitelist.GetClientData()
+        blacklist_tag_slices = self._advanced_blacklist.GetTags()
+        whitelist_tag_slices = self._advanced_whitelist.GetTags()
         
         blacklist_is_only_simples = set( blacklist_tag_slices ).issubset( { '', ':' } )
         
@@ -813,7 +848,7 @@ class EditTagFilterPanel( ClientGUIScrolledPanels.EditPanel ):
         
         for tag_slice in tag_slices:
             
-            if tag_slice in ( '', ':' ) and tag_slice in self._simple_whitelist.GetClientData():
+            if tag_slice in ( '', ':' ) and tag_slice in self._simple_whitelist.GetTags():
                 
                 self._AdvancedAddBlacklist( tag_slice )
                 
@@ -866,8 +901,8 @@ class EditTagFilterPanel( ClientGUIScrolledPanels.EditPanel ):
         
         ( whitelist_possible, blacklist_possible ) = self._GetWhiteBlacklistsPossible()
         
-        whitelist_tag_slices = self._advanced_whitelist.GetClientData()
-        blacklist_tag_slices = self._advanced_blacklist.GetClientData()
+        whitelist_tag_slices = self._advanced_whitelist.GetTags()
+        blacklist_tag_slices = self._advanced_blacklist.GetTags()
         
         if whitelist_possible:
             
@@ -935,8 +970,8 @@ class EditTagFilterPanel( ClientGUIScrolledPanels.EditPanel ):
         
         #
         
-        whitelist_tag_slices = self._advanced_whitelist.GetClientData()
-        blacklist_tag_slices = self._advanced_blacklist.GetClientData()
+        whitelist_tag_slices = self._advanced_whitelist.GetTags()
+        blacklist_tag_slices = self._advanced_blacklist.GetTags()
         
         if blacklist_possible:
             
@@ -995,8 +1030,8 @@ class EditTagFilterPanel( ClientGUIScrolledPanels.EditPanel ):
         
         #
         
-        whitelist_tag_slices = self._advanced_whitelist.GetClientData()
-        blacklist_tag_slices = self._advanced_blacklist.GetClientData()
+        whitelist_tag_slices = self._advanced_whitelist.GetTags()
+        blacklist_tag_slices = self._advanced_blacklist.GetTags()
         
         if len( blacklist_tag_slices ) == 0:
             
@@ -1096,7 +1131,7 @@ class EditTagFilterPanel( ClientGUIScrolledPanels.EditPanel ):
             
             tag_slice = QP.GetClientData( self._simple_whitelist_global_checkboxes, index )
             
-            if tag_slice in ( '', ':' ) and tag_slice in self._simple_whitelist.GetClientData():
+            if tag_slice in ( '', ':' ) and tag_slice in self._simple_whitelist.GetTags():
                 
                 self._AdvancedAddBlacklist( tag_slice )
                 
@@ -1111,12 +1146,12 @@ class EditTagFilterPanel( ClientGUIScrolledPanels.EditPanel ):
         
         tag_filter = ClientTags.TagFilter()
         
-        for tag_slice in self._advanced_blacklist.GetClientData():
+        for tag_slice in self._advanced_blacklist.GetTags():
             
             tag_filter.SetRule( tag_slice, CC.FILTER_BLACKLIST )
             
         
-        for tag_slice in self._advanced_whitelist.GetClientData():
+        for tag_slice in self._advanced_whitelist.GetTags():
             
             tag_filter.SetRule( tag_slice, CC.FILTER_WHITELIST )
             
@@ -1124,7 +1159,7 @@ class EditTagFilterPanel( ClientGUIScrolledPanels.EditPanel ):
         return tag_filter
         
     
-    def SetValue( self, tag_filter ):
+    def SetValue( self, tag_filter: ClientTags.TagFilter ):
         
         blacklist_tag_slices = [ tag_slice for ( tag_slice, rule ) in tag_filter.GetTagSlicesToRules().items() if rule == CC.FILTER_BLACKLIST ]
         whitelist_tag_slices = [ tag_slice for ( tag_slice, rule ) in tag_filter.GetTagSlicesToRules().items() if rule == CC.FILTER_WHITELIST ]
diff --git a/include/ClientImportOptions.py b/include/ClientImportOptions.py
index 26de0db4..fe833b99 100644
--- a/include/ClientImportOptions.py
+++ b/include/ClientImportOptions.py
@@ -1390,7 +1390,7 @@ class ServiceTagImportOptions( HydrusSerialisable.SerialisableBase ):
                 
                 tags.difference_update( applicable_tags )
                 
-                existing_applicable_tags = HG.client_controller.Read( 'filter_existing_tags', service_key, tags )
+                existing_applicable_tags = HG.client_controller.Read( 'filter_existing_tags', service_key, applicable_tags )
                 
                 tags.update( existing_applicable_tags )
                 
diff --git a/include/ClientNetworkingDomain.py b/include/ClientNetworkingDomain.py
index 14bf3028..a59c7683 100644
--- a/include/ClientNetworkingDomain.py
+++ b/include/ClientNetworkingDomain.py
@@ -429,6 +429,12 @@ class NetworkDomainManager( HydrusSerialisable.SerialisableBase ):
             return self._file_post_default_tag_import_options
             
         
+        # some lad decided to api convert one url type to another
+        if url_class.GetURLType() not in ( HC.URL_TYPE_POST, HC.URL_TYPE_WATCHABLE ):
+            
+            return self._file_post_default_tag_import_options
+            
+        
         url_class_key = url_class.GetMatchKey()
         
         if url_class_key in self._url_class_keys_to_default_tag_import_options:
diff --git a/include/ClientNetworkingLogin.py b/include/ClientNetworkingLogin.py
index d6250a6a..242e3587 100644
--- a/include/ClientNetworkingLogin.py
+++ b/include/ClientNetworkingLogin.py
@@ -352,11 +352,7 @@ class NetworkLoginManager( HydrusSerialisable.SerialisableBase ):
                     
                 except Exception as e:
                     
-                    message = 'Service has had a recent error or is otherwise not functional! Specific error was:'
-                    message += os.linesep * 2
-                    message += str( e )
-                    message += os.linesep * 2
-                    message += 'You might like to try refreshing its account in \'review services\'.'
+                    message = 'Service has had a recent error or is otherwise not functional! You might like to try refreshing its account in \'review services\'. Specific error was: {}'.format( e )
                     
                     raise HydrusExceptions.ValidationException( message )
                     
@@ -1014,9 +1010,9 @@ class LoginScriptHydrus( object ):
                 
                 HydrusData.Print( 'Successfully logged into ' + service.GetName() + '.' )
                 
-            else:
+            elif service.IsFunctional():
                 
-                service.DelayFutureRequests( 'Could not log in for unknown reason.' )
+                service.DelayFutureRequests( 'Could not log in for unknown reason. Current service status: {}'.format( service.GetStatusString() ) )
                 
             
         except Exception as e:
diff --git a/include/ClientOptions.py b/include/ClientOptions.py
index 7b42913b..1c07f17b 100644
--- a/include/ClientOptions.py
+++ b/include/ClientOptions.py
@@ -417,7 +417,6 @@ class ClientOptions( HydrusSerialisable.SerialisableBase ):
         self._dictionary[ 'strings' ][ 'default_gug_name' ] = 'safebooru tag search'
         self._dictionary[ 'strings' ][ 'has_audio_label' ] = '\U0001F50A'
         self._dictionary[ 'strings' ][ 'has_duration_label' ] = ' \u23F5 '
-        self._dictionary[ 'strings' ][ 'mpv_conf_path_portable' ] = HydrusPaths.ConvertAbsPathToPortablePath( os.path.join( HC.STATIC_DIR, 'mpv-conf', 'default_mpv.conf' ) )
         
         self._dictionary[ 'string_list' ] = {}
         
diff --git a/include/ClientParsing.py b/include/ClientParsing.py
index 1f686303..d50b86a4 100644
--- a/include/ClientParsing.py
+++ b/include/ClientParsing.py
@@ -2407,7 +2407,7 @@ class ParseNodeContentLink( HydrusSerialisable.SerialisableBase ):
             
             if job_key.IsCancelled():
                 
-                raise HydrusExceptions.CancelledException()
+                raise HydrusExceptions.CancelledException( 'Job was cancelled.' )
                 
             
         
@@ -2696,7 +2696,7 @@ class ParseRootFileLookup( HydrusSerialisable.SerialisableBaseNamed ):
         
         if job_key.IsCancelled():
             
-            raise HydrusExceptions.CancelledException()
+            raise HydrusExceptions.CancelledException( 'Job was cancelled.' )
             
         
         parsing_text = network_job.GetContentText()
@@ -2918,40 +2918,54 @@ class StringConverter( HydrusSerialisable.SerialisableBase ):
                     
                 elif transformation_type == STRING_TRANSFORMATION_ENCODE:
                     
-                    # due to py3, this is now a bit of a pain
-                    # _for now_, let's convert to bytes and then spit out a str
-                    
                     encode_type = data
                     
-                    if isinstance( s, str ):
+                    if encode_type == 'url percent encoding':
                         
-                        s = bytes( s, 'utf-8' )
+                        s = urllib.parse.quote( s, safe = '' )
                         
-                    
-                    if encode_type == 'hex':
+                    else:
                         
-                        s = s.hex()
+                        # due to py3, this is now a bit of a pain
+                        # _for now_, let's convert to bytes and then spit out a str
                         
-                    elif encode_type == 'base64':
+                        if isinstance( s, str ):
+                            
+                            s = bytes( s, 'utf-8' )
+                            
                         
-                        s = str( base64.b64encode( s ), 'utf-8' )
+                        if encode_type == 'hex':
+                            
+                            s = s.hex()
+                            
+                        elif encode_type == 'base64':
+                            
+                            s = str( base64.b64encode( s ), 'utf-8' )
+                            
                         
                     
                 elif transformation_type == STRING_TRANSFORMATION_DECODE:
                     
-                    # due to py3, this is now a bit of a pain
-                    # as this is mostly used for hash stuff, _for now_, let's spit out a **bytes**
-                    # the higher up object will have responsibility for coercing to str if needed
-                    
                     encode_type = data
                     
-                    if encode_type == 'hex':
+                    if encode_type == 'url percent encoding':
                         
-                        s = bytes.fromhex( s )
+                        s = urllib.parse.unquote( s )
                         
-                    elif encode_type == 'base64':
+                    else:
                         
-                        s = base64.b64decode( s )
+                        # due to py3, this is now a bit of a pain
+                        # as this is mostly used for hash stuff, _for now_, let's spit out a **bytes**
+                        # the higher up object will have responsibility for coercing to str if needed
+                        
+                        if encode_type == 'hex':
+                            
+                            s = bytes.fromhex( s )
+                            
+                        elif encode_type == 'base64':
+                            
+                            s = base64.b64decode( s )
+                            
                         
                     
                 elif transformation_type == STRING_TRANSFORMATION_REVERSE:
diff --git a/include/ClientSearch.py b/include/ClientSearch.py
index 1a61abe1..735c7060 100644
--- a/include/ClientSearch.py
+++ b/include/ClientSearch.py
@@ -86,6 +86,11 @@ def ConvertEntryTextToSearchText( entry_text ):
     
     wildcard_text = entry_text
     
+    while '**' in wildcard_text:
+        
+        wildcard_text = wildcard_text.replace( '**', '*' )
+        
+    
     entry_text = ConvertTagToSearchable( entry_text )
     
     ( namespace, subtag ) = HydrusTags.SplitTag( entry_text )
diff --git a/include/HydrusConstants.py b/include/HydrusConstants.py
index 30570afe..5b0aa75b 100755
--- a/include/HydrusConstants.py
+++ b/include/HydrusConstants.py
@@ -1,29 +1,29 @@
 import os
 import sys
 
-# dirs
+# old method of getting frozen dir, doesn't work for symlinks looks like:
+# BASE_DIR = getattr( sys, '_MEIPASS', None )
 
-if getattr( sys, 'frozen', False ):
+RUNNING_FROM_FROZEN_BUILD = getattr( sys, 'frozen', False )
+
+if RUNNING_FROM_FROZEN_BUILD:
     
-    RUNNING_FROM_FROZEN_BUILD = True
+    real_exe_path = os.path.realpath( sys.executable )
     
-    # we are in a pyinstaller frozen app
-    
-    BASE_DIR = getattr( sys, '_MEIPASS', None )
-    
-    if BASE_DIR is None:
-        
-        raise Exception( 'It seems this hydrus is running from a frozen bundle, but there was no _MEIPASS variable under sys to define the bundle directory.' )
-        
+    BASE_DIR = os.path.dirname( real_exe_path )
     
 else:
     
-    # maybe this is better?
-    # os.path.dirname( __file__ )
-    
-    RUNNING_FROM_FROZEN_BUILD = False
-    
-    BASE_DIR = sys.path[0]
+    try:
+        
+        hc_realpath_dir = os.path.dirname( os.path.realpath( __file__ ) )
+        
+        BASE_DIR = os.path.split( hc_realpath_dir )[0]
+        
+    except NameError: # if __file__ is not defined due to some weird OS
+        
+        BASE_DIR = os.path.realpath( sys.path[0] )
+        
     
     if BASE_DIR == '':
         
@@ -70,7 +70,7 @@ options = {}
 # Misc
 
 NETWORK_VERSION = 18
-SOFTWARE_VERSION = 388
+SOFTWARE_VERSION = 389
 CLIENT_API_VERSION = 11
 
 SERVER_THUMBNAIL_DIMENSIONS = ( 200, 200 )
diff --git a/include/QtPorting.py b/include/QtPorting.py
index b89e6c0d..82de5438 100644
--- a/include/QtPorting.py
+++ b/include/QtPorting.py
@@ -242,7 +242,7 @@ class FilePickerCtrl( QW.QWidget ):
     
     filePickerChanged = QC.Signal()
 
-    def __init__( self, parent = None, wildcard = None ):
+    def __init__( self, parent = None, wildcard = None, starting_directory = None ):
         
         QW.QWidget.__init__( self, parent )
 
@@ -265,6 +265,8 @@ class FilePickerCtrl( QW.QWidget ):
         
         self._wildcard = wildcard
         
+        self._starting_directory = starting_directory
+        
 
     def SetPath( self, path ):
         
@@ -285,6 +287,11 @@ class FilePickerCtrl( QW.QWidget ):
         
         existing_path = self._path_edit.text()
         
+        if existing_path == '' and self._starting_directory is not None:
+            
+            existing_path = self._starting_directory
+            
+        
         if self._save_mode:
             
             if self._wildcard:
@@ -1714,7 +1721,7 @@ class CheckListBox( QW.QListWidget ):
 
     def GetChecked( self ):
 
-        result = [ GetClientData( self, index ) for index in self.GetCheckedItems() ]
+        result = [ self.item( index ).data( QC.Qt.UserRole ) for index in self.GetCheckedItems() ]
 
         return result
 
@@ -1723,7 +1730,7 @@ class CheckListBox( QW.QListWidget ):
 
         for index in range( self.count() ):
 
-                data = GetClientData( self, index )
+                data = self.item( index ).data( QC.Qt.UserRole )
 
                 check_it = data in datas
 
@@ -2487,10 +2494,8 @@ class CollectComboCtrl( QW.QComboBox ):
         
         self.view().pressed.connect( self._HandleItemPressed )
         
-        if QW.QApplication.style().metaObject().className() == "QFusionStyle":
-            
-            self.setItemDelegate( CheckBoxDelegate() )
-            
+        # this was previously 'if Fusion style only', but as it works for normal styles too, it is more helpful to have it always on
+        self.setItemDelegate( CheckBoxDelegate() )
         
         self.setModel( QG.QStandardItemModel( self ) )
 
@@ -2550,7 +2555,7 @@ class CollectComboCtrl( QW.QComboBox ):
 
         for index in self.GetCheckedItems():
 
-            (collect_type, collect_data) = GetClientData( self, index )
+            (collect_type, collect_data) = self.itemData( index, QC.Qt.UserRole )
 
             if collect_type == 'namespace':
 
@@ -2596,7 +2601,7 @@ class CollectComboCtrl( QW.QComboBox ):
 
             for index in range( self.count() ):
 
-                ( collect_type, collect_data ) = GetClientData( self, index )
+                ( collect_type, collect_data ) = self.itemData( index, QC.Qt.UserRole )
 
                 p1 = collect_type == 'namespace' and collect_data in media_collect.namespaces
                 p2 = collect_type == 'rating' and collect_data in media_collect.rating_service_keys
diff --git a/static/default/login_scripts/nijie.info login script.png b/static/default/login_scripts/nijie.info login script.png
deleted file mode 100644
index e8050315e2548c48ba7074ccf6cc0060104577ba..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2523
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

diff --git a/static/default/parsers/deviant art file page api parser.png b/static/default/parsers/deviant art file page api parser.png
new file mode 100644
index 0000000000000000000000000000000000000000..6aac3201bbc6c581bdc1b67ce6c2d6c62b722bfa
GIT binary patch
literal 2203
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
b#us_UglGu1fO75k=>S$1r_7%a+;08@*Ea8P

literal 0
HcmV?d00001

diff --git a/static/default/parsers/e621 file page parser.png b/static/default/parsers/e621 file page parser.png
index 3be621deb3cf2045cd3135165c798cb48819092b..8472ba590ed1f68fedba16a27f2215adcf89a8fe 100644
GIT binary patch
delta 2280
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
C*FI1H

delta 2296
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
SQ;w7X0000<MNUMnLSTZmkXv2=

diff --git a/static/default/url_classes/deviant art file page api.png b/static/default/url_classes/deviant art file page api.png
new file mode 100644
index 0000000000000000000000000000000000000000..47b8f6a3cecec52e9bd869403a34ddd573e11169
GIT binary patch
literal 1856
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

literal 0
HcmV?d00001

diff --git a/static/default/url_classes/deviant art file page.png b/static/default/url_classes/deviant art file page.png
index cd81a84aa89e43a1ec050f63fa5eea6f82404f27..8573b3685d705167e0f9c5390350efd9b3d3a22d 100644
GIT binary patch
delta 1731
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
ZA5feU>_)4?lb`?q002ovPDHLkV1gO0B&q-a

delta 2136
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
O0000<MNUMnLSTXpjuQ9)

diff --git a/static/default/url_classes/e621 file page (old format).png b/static/default/url_classes/e621 file page (old format).png
new file mode 100644
index 0000000000000000000000000000000000000000..a36ebad25a4a9b916c15b8878a0a5c3bee5349d3
GIT binary patch
literal 2003
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

literal 0
HcmV?d00001