WIP REBASE ipc refactoring

2022-08-27 10:21:58 +02:00
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,56 +1,4 @@
 # looqs: Release notes
-
-## 2023-05-07 - v0.9
-Highlights: Tag support. Also begin new index mode to only index metadata (currently only path + file size, more to come).
-
-Note: Upgrading can take some time as new column indexes will be added
-
-CHANGES:
-
- - gui: Improve font rendering in previews
- - gui: Allow indexing only metadata
- - gui: Allow adding content for files which only had metadata indexed before
- - gui: Allow assigning tags by right clicking on paths
- - cli: "add" command: Implement --verbose (-v)
- - cli: "add" command: Implement --no-content and --fill-content
- - cli: Add "tag" command which allows managing tags for paths.
- - search: Add "tag:()", "t:()" filters
- - Minor improvements and refactorings under the hood
- - Add packages: Ubuntu 23.04.
-
-
-## 2022-11-19 - v0.8.1
-
-CHANGES:
- - Fix regression causing previews in second (and higher) result page to not render
- - Minor improvements
-
-## 2022-10-22 - v0.8
-
-CHANGES:
- - For new, not previously indexed files, start creating an additional index using sqlite's experimental trigram tokenizer. Thanks to that, we can now match substrings >= 3 of an unicode sequence. Results of the usual index are prioritized.
- - GUI: Ensure order of previews matches ranking exactly. Previously, it depended simply on the time preview generators took, i. e. it was more or less a race.
- - Report progress more often during indexing, so users don't get the impression that it's stuck when processing dirs with large documents.
- - Fix a regression that caused phrase queries to be broken
- - Minor improvements
- - Add packages: Ubuntu 22.10.
-
-## 2022-09-10 - v0.7
-
-CHANGES:
-
- - GUI: Add vertical scroll option, default to it. Most feedback considered horizontal scrolling unnatural.
- - GUI: Previews: Improve plaintext preview snippet selection by prioritizing those which contain the most search terms
- - GUI: Previews: Only highlight whole words, not parts in words.
- - GUI: Previews: Don't treat text wrapped inside '<' '>' in plaintext files as HTMl tags which caused such text to get lost in previews.
- - GUI: Avoid triggering preview generation in some cases even when previews tab is not the active one
- - GUI: Implement a search history. Allow going up/down with arrow keys in the search field.
- - GUI: Previews: Allow CTRL + mouse wheel to zoom in on previews
- - General: Fix an incorrect sqlite query which caused the ranking information of search results to be lost. "All files" filter in the previews tab therefore now orders by the seemingly most relevant pages, across all documents.
- - General: Fix handling of content search queries with prefix terms (those ending in '*').
- - GUI: Show how many results are previewable.
- - GUI: Refactor to improve stability of sandboxed IPC worker in order to avoid rare segfaults.
-
 ## 2022-08-14 - v0.6
 This release features multiple fixes and enhancements.

--- a/HACKING.md
+++ b/HACKING.md
@ -1,7 +1,12 @@
 # looqs - Hacking

 ## Introduction
-If you are interested on how to contribute, please see the file [CONTRIBUTING.md](CONTRIBUTING.md) which contains the instructions on how to submit patches etc.
+Without elaborating here, I hacked looqs because I was not satisfied with the state of desktop search on Linux.
+
+Originally a set of CLI python  scripts, it is now written in C++ and offers a GUI made using Qt. While a "web app" would have been an option, I prefer a desktop application for something like looqs. I chose Qt because I am more familiar with it than with any other GUI framework. To my knowledge, potential alternatives like GTK do not include as many "batteries" as Qt anyway, so the job presumably would have been harder there,
+at least for me.
+
+If you are interested in how to contribute, please see the file [CONTRIBUTING.md](CONTRIBUTING.md) which contains the instructions on how to submit patches etc.

 ## Security
 The architecture ensures that the parsing of documents and the preview generation is sandboxed by [exile.h](https://github.com/quitesimpleorg/exile.h). looqs uses a multi-process architecture to achieve this.
@ -11,8 +16,7 @@ Qt code is considered trusted in this model. While one may critize this, it was
 Set the enviornment variable `LOOQS_DISABLE_SANDBOX=1` to disable sandboxing. It's intended for troublehshooting.

 ## Database
-The heart is sqlite, with the FTS5 extensions behind the full-text search. While FTS may not be sqlite's strong suit, I definitely did not want to run one of those oftenly recommended heavy (Java based) solutions. I explored other options like Postgresql, I've discard them due to some limitations back then. It's also natural to use sqlite as it's
-used for metadata in general.
+The heart is sqlite, with the FTS5 extensions behind the full-text search. While FTS may not be sqlite's strong suit, I definitly did not want to run one of those oftenly recommended heavy (Java based) solutions. I explored other options like Postgresql, I've discard them due to some limitations back then.

 Down the road, alternatives will be explored of course if sqlite should not suffice anymore.

@ -23,7 +27,7 @@ looqs simply strips the tags and that seems to work fine so far. Naturally, this
 Naturally, looqs won't be able to index and render previews for everything. Such approach would create a huge bloated binary. In the future, there will be some plugin system of some sorts, either we will load .so objects or use subprocesses.

 ## Name
-looqs looks for files. You as the user can also look inside them. The 'k' in "looks" was replaced by a 'q'. Originally, I wanted my projects to have "qs" (for quitesimple) in their name. While that quirk is abandoned now, this got us to looqs.
+looqs looks for files. You as the user can also look inside them. The 'k' in "looks" was replaced by a 'q'. Originally, I wanted my projects to have "qs" (for quitesimple) in their name. While abandoned now, this got us to looqs.



--- a/2
+++ b/2
@ -1,4 +1,4 @@
-Copyright (c) 2018-2023: Albert Schwarzkopf <looqs at quitesimple period org>
+Copyright (c) 2018-2022: Albert Schwarzkopf <looqs at quitesimple period org>

 looqs is made available under the following license: 

--- a/README.md
+++ b/README.md
@ -28,12 +28,9 @@ There is no need to write the long form of filters. There are also booleans avai
 The screenshots in this section may occasionally be slightly outdated, but they are usually recent enough to get an overall impression of the current state of the GUI.

 ## Current status
-Latest version: 2023-05-07, v0.9
+Latest version: 2022-08-14, v0.6

-Please keep in mind: looqs is still at an early stage and may exhibit some weirdness and contain bugs.
-
-Please see [Changelog](CHANGELOG.md) for a human readable list of changes. For download instructions, see
-further down this document.
+Please see [Changelog](CHANGELOG.md) for a human readable list of changes.


 ## Goals and principles
@ -76,7 +73,7 @@ To build on Ubuntu and Debian, clone the repo and then run:
 ```
 git submodule init
 git submodule update
-sudo apt install build-essential qtbase5-dev libqt5sql5-sqlite libpoppler-qt5-dev libuchardet-dev libquazip5-dev
+sudo apt install build-essential qtbase5-dev libpoppler-qt5-dev libuchardet-dev libquazip5-dev
 qmake
 make
 ```
@ -97,9 +94,7 @@ The GUI is located in `gui/looqs-gui`, the binary for the CLI is in `cli/looqs`
 ## Packages
 At this point, looqs is not in any official distro package repo, but I maintain some packages.

-
-
-### Ubuntu 23.04, 22.10, 22.04
+### Ubuntu 22.04
 Latest release can be installed using apt from the repo.
 ```
 # First, obtain key, assume it's trusted.
@ -110,8 +105,6 @@ echo "deb [arch=amd64 signed-by=/usr/share/keyrings/repo.quitesimple.org.gpg] ht
 sudo apt-get update
 sudo apt-get install looqs
 ```
-### Gentoo (EXPERIMENTAL)
-Available in this overlay: https://github.com/quitesimpleorg/quitesimple-overlay

 ### Prebuilt tarball (distro-agnostic) (EXPERIMENTAL)
 looqs is also distributed as a tarball containing prebuilt binaries and its library dependencies. The tarball is
@ -138,7 +131,7 @@ An AppImage may accompany the tarball in the future.


 ### Other distros
-I appreciate help for others distros. If you create a package, let me know!
+I'll probably add a package for voidlinux at some point and maybe will provide a Gentoo ebuild. However, I would appreciate help for others distros. If you create a package, let me know!


 ### Signature verification
--- a/USAGE.md
+++ b/USAGE.md
@ -47,23 +47,16 @@ you can quickly perform content searches in paths containing 'docs'.

 **CTRL + W**: Removes the last filter. If we take above's example "p:(docs) c:(invoice credit card)" again, then CTRL + W kills "c:(invoice credit card)".

-The arrow keys (up and down) can be used to go back and forward in the search history.
-
 ### Configuring PDF viewer
 It's most convenient if, when you click on a preview, the PDF reader opens the page you clicked. For that, looqs needs to know which viewer you want to launch.

 It tries to auto detect some common viewers. You must set the value in the "Settings" tab yourself if the
 default does not work for you. In the command line options, "%f" represents the filepath, "%p" the page number.

-### Previews tab
-The 'previews' tab shows previews. It marks your search keywords too. Click on a preview to open the file.
+### Preview tab
+The preview tab shows previews. It marks your search keywords too. Click on a preview to open the file.
 A right click on a preview allows you to copy the file path, or to open the containing folder.

-When the combobox is set to "All previews", the previews are ordered by relevance from all documents/pages.
-
-By default, a vertical scrolling is active. In the settings, it can be changed to horizontal scroll, which may be
-preferred by users of (larger) wide screen monitors.
-
 ### Syncing index
 Over time, files get deleted or their content changes. Go to **looqs** -> **Sync index**. looqs will reindex the content of files which have been changed. Files that cannot be found anymore will be removed from the index.

@ -165,8 +158,6 @@ A number of search filters are available.
 | path.begins:(term) | pb:(term) |  Filters path beginning with the specified term |
 | contains:(terms) | c:(terms) | Full-text search, also understands quotes |
 | limit:(integer) | - | Limits the number of results. The default is 1000. Say "limit:0" to see all results |
-| tag:(tagname) | t:(tagname) | Filter for files that have been tagged with the corresponding tag |
-
 Filters can be combined. The booleans AND and OR are supported. Negations can be applied too, except for c:(). Negations are specified with "!".
 The AND boolean is implicit and thus entering it strictly optional.

@ -179,5 +170,11 @@ Examples:
 |p:(notes) (pe:(odt) OR pe:(docx)) &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;|Finds files such as notes.docx, notes.odt but also any .docs and .odt when the path contains the string 'notes'|
 |memcpy !(pe:(.c) OR pe:(.cpp))| Performs a FTS search for 'memcpy' but excludes .cpp and .c files.|
 |c:("I think, therefore")|Performs a FTS search for the phrase "I think, therefore".|
-|c:("invoice") Downloads|Equivalent to c:("invoice") p:("Downloads")|
-|p:(Downloads) invoice|Equivalent to c:("invoice") p:("Downloads")|
+|c:("invoice") Downloads|This query is equivalent to c:("invoice") p:("Downloads")|
+
+
+
+
+
+
+
--- a/cli/cli.pro
+++ b/cli/cli.pro
@ -15,7 +15,6 @@ DEFINES += QT_DEPRECATED_WARNINGS
 # You can also select to disable deprecated APIs only up to a certain version of Qt.
 #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
 SOURCES += \
-    commandtag.cpp \
        main.cpp \
    commandadd.cpp \
    commanddelete.cpp \
@ -28,7 +27,6 @@ HEADERS += \
    command.h \
    commandadd.h \
    commanddelete.h \
-    commandtag.h \
    commandupdate.h \
    commandsearch.h \
    commandlist.h
--- a/cli/command.cpp
+++ b/cli/command.cpp
@ -2,6 +2,7 @@
 #include <QThread>
 #include <QDebug>
 #include "command.h"
+#include "looqsgeneralexception.h"

 void Command::execute()
 {
--- a/cli/commandadd.cpp
+++ b/cli/commandadd.cpp
@ -23,7 +23,7 @@ void CommandAdd::indexerFinished()
 	if(failedPathsCount > 0)
 	{
 		Logger::info() << "Failed paths: " << Qt::endl;
-		for(const QString &paths : result.failedPaths())
+		for(QString paths : result.failedPaths())
 		{
 			Logger::info() << paths << Qt::endl;
 		}
@ -41,36 +41,23 @@ int CommandAdd::handle(QStringList arguments)
 {
 	QCommandLineParser parser;
 	parser.addOptions({{{"c", "continue"},
-						"Continue adding files, don't exit on first error. Exit code will be 0. If this option is not "
-						"given, looqs will "
-						"exit asap, but it's possible that a few files will still be processed."
+						"Continue adding files, don't exit on first error. If this option is not given, looqs will "
+						"exit asap, but it's possible that a few files will still be processed. "
 						"Set -t 1 to avoid this behavior, but processing will be slower. "},
-					   {{"n", "no-content"}, "Only add paths to database. Do not index content"},
-					   {{"v", "verbose"}, "Print paths of files being processed"},
-					   {{"f", "fill-content"}, "Index content for files previously indexed with -n"},
 					   {{"t", "threads"}, "Number of threads to use.", "threads"}});
+
 	parser.addHelpOption();
 	parser.addPositionalArgument("add", "Add paths to the index",
 								 "add [paths...]. If no path is given, read from stdin, one path per line.");

 	parser.process(arguments);
 	this->keepGoing = parser.isSet("continue");
-	bool pathsOnly = parser.isSet("no-content");
-	bool fillContent = parser.isSet("fill-content");
-	bool verbose = parser.isSet("verbose");
-
 	if(parser.isSet("threads"))
 	{
 		QString threadsCount = parser.value("threads");
 		QThreadPool::globalInstance()->setMaxThreadCount(threadsCount.toInt());
 	}

-	if(pathsOnly && fillContent)
-	{
-		Logger::error() << "Invalid options: -n and -f cannot both be set";
-		return EXIT_FAILURE;
-	}
-
 	QStringList files = parser.positionalArguments();

 	if(files.length() == 0)
@ -84,47 +71,15 @@ int CommandAdd::handle(QStringList arguments)
 		}
 	}

-	FileSaverOptions fileSaverOptions;
-	fileSaverOptions.keepGoing = keepGoing;
-	fileSaverOptions.fillExistingContentless = fillContent;
-	fileSaverOptions.metadataOnly = pathsOnly;
-	fileSaverOptions.verbose = verbose;
-
 	indexer = new Indexer(*this->dbService);
-	indexer->setFileSaverOptions(fileSaverOptions);
-
 	indexer->setTargetPaths(files.toVector());
-
-	if(verbose)
-	{
-		indexer->setProgressReportThreshold(1);
-	}
+	indexer->setKeepGoing(keepGoing);

 	connect(indexer, &Indexer::pathsCountChanged, this,
 			[](int pathsCount) { Logger::info() << "Found paths: " << pathsCount << Qt::endl; });
 	connect(indexer, &Indexer::indexProgress, this,
-			[verbose, this](int pathsCount, unsigned int /*added*/, unsigned int /*skipped*/, unsigned int /*failed*/,
-							unsigned int /*totalCount*/)
-			{
-				Logger::info() << "Processed files: " << pathsCount << Qt::endl;
-				if(verbose)
-				{
-					IndexResult indexResult = indexer->getResult();
-					int newlyAdded = indexResult.results.count() - currentResult.results.count();
-					if(newlyAdded > 0)
-					{
-						int newOffset = indexResult.results.count() - newlyAdded;
-						for(int i = newOffset; i < indexResult.results.count(); i++)
-						{
-							auto result = indexResult.results.at(i);
-							Logger::info() << SaveFileResultToString(result.second) << result.first << Qt::endl;
-						}
-					}
-					this->currentResult = indexResult;
-				}
-			}
-
-	);
+			[](int pathsCount, unsigned int added, unsigned int skipped, unsigned int failed, unsigned int totalCount)
+			{ Logger::info() << "Processed files: " << pathsCount << Qt::endl; });
 	connect(indexer, &Indexer::finished, this, &CommandAdd::indexerFinished);

 	this->autoFinish = false;
--- a/cli/commandadd.h
+++ b/cli/commandadd.h
@ -13,8 +13,6 @@ class CommandAdd : public Command
 	bool keepGoing = true;

  protected:
-	IndexResult currentResult;
-
  public:
 	using Command::Command;

--- a/cli/commandlist.cpp
+++ b/cli/commandlist.cpp
@ -1,5 +1,6 @@
 #include <QCommandLineParser>
 #include "commandlist.h"
+#include "databasefactory.h"
 #include "logger.h"

 int CommandList::handle(QStringList arguments)
--- a/cli/commandsearch.cpp
+++ b/cli/commandsearch.cpp
@ -1,5 +1,6 @@
 #include <QCommandLineParser>
 #include "commandsearch.h"
+#include "databasefactory.h"
 #include "logger.h"

 int CommandSearch::handle(QStringList arguments)
--- a/cli/commandtag.cpp
+++ b/cli/commandtag.cpp
@ -1,153 +0,0 @@
-#include <QCommandLineParser>
-#include "commandtag.h"
-#include "logger.h"
-#include "tagmanager.h"
-
-bool CommandTag::ensureAbsolutePaths(const QVector<QString> &paths, QVector<QString> &absolutePaths)
-{
-	for(const QString &path : paths)
-	{
-		QFileInfo info{path};
-		if(!info.exists())
-		{
-			Logger::error() << "Can't add tag for file  " + info.absoluteFilePath() + " because it does not exist"
-							<< Qt::endl;
-			return false;
-		}
-		QString absolutePath = info.absoluteFilePath();
-		if(!this->dbService->fileExistsInDatabase(absolutePath))
-		{
-			Logger::error() << "Only files that have been indexed can be tagged. File not in index: " + absolutePath
-							<< Qt::endl;
-			return false;
-		}
-		absolutePaths.append(absolutePath);
-	}
-	return true;
-}
-
-int CommandTag::handle(QStringList arguments)
-{
-	QCommandLineParser parser;
-	parser.addPositionalArgument("add", "Adds a tag to a file",
-								 "add [tag] [paths...]. Adds the tag to the specified paths");
-	parser.addPositionalArgument("remove", "Removes a path associated to a tag", "remove [tag] [path]");
-	parser.addPositionalArgument("delete", "Deletes a tag", "delete [tag]");
-	parser.addPositionalArgument("list", "Lists paths associated with a tag, or all tags", "list [tag]");
-	parser.addPositionalArgument("show", "Lists tags associated with a path", "show [path]");
-
-	parser.addHelpOption();
-
-	parser.parse(arguments);
-
-	QStringList args = parser.positionalArguments();
-	if(args.length() == 0)
-	{
-		parser.showHelp(EXIT_FAILURE);
-		return EXIT_FAILURE;
-	}
-	TagManager tagManager{*this->dbService};
-	QString cmd = args[0];
-	if(cmd == "add")
-	{
-		if(args.length() < 3)
-		{
-			Logger::error() << "Not enough arguments provided. 'add' requires a tag followed by at least one path"
-							<< Qt::endl;
-			return EXIT_FAILURE;
-		}
-		QString tag = args[1];
-		QVector<QString> paths = args.mid(2).toVector();
-
-		QVector<QString> absolutePaths;
-		if(!ensureAbsolutePaths(paths, absolutePaths))
-		{
-			return EXIT_FAILURE;
-		}
-		bool result = tagManager.addPathsToTag(tag, absolutePaths);
-		if(!result)
-		{
-			Logger::error() << "Failed to assign tags" << Qt::endl;
-			return EXIT_FAILURE;
-		}
-		return EXIT_SUCCESS;
-	}
-	if(cmd == "list")
-	{
-
-		QString tag;
-		if(args.length() >= 2)
-		{
-			tag = args[1];
-		}
-		QVector<QString> entries;
-		if(tag.isEmpty())
-		{
-			entries = tagManager.getTags();
-		}
-		else
-		{
-			entries = tagManager.getPaths(tag);
-		}
-		for(const QString &entry : entries)
-		{
-			Logger::info() << entry << Qt::endl;
-		}
-	}
-	if(cmd == "remove")
-	{
-		if(args.length() < 3)
-		{
-			Logger::error() << "Not enough arguments provided. 'remove' requires a tag followed by at least one path"
-							<< Qt::endl;
-			return EXIT_FAILURE;
-		}
-		QString tag = args[1];
-		QVector<QString> paths = args.mid(2).toVector();
-
-		QVector<QString> absolutePaths;
-		if(!ensureAbsolutePaths(paths, absolutePaths))
-		{
-			return EXIT_FAILURE;
-		}
-
-		if(!tagManager.removePathsForTag(tag, absolutePaths))
-		{
-			Logger::error() << "Failed to remove path assignments" << Qt::endl;
-			return EXIT_FAILURE;
-		}
-	}
-	if(cmd == "delete")
-	{
-		if(args.length() != 2)
-		{
-			Logger::error() << "The 'delete' command requires the tag to delete" << Qt::endl;
-			return EXIT_FAILURE;
-		}
-		if(!tagManager.deleteTag(args[1]))
-		{
-			Logger::error() << "Failed to delete tag" << Qt::endl;
-			return EXIT_FAILURE;
-		}
-	}
-	if(cmd == "show")
-	{
-		if(args.length() != 2)
-		{
-			Logger::error() << "The 'show' command requires a path to show the assigned tags" << Qt::endl;
-			return EXIT_FAILURE;
-		}
-		QString path = args[1];
-		QVector<QString> absolutePaths;
-		if(!ensureAbsolutePaths({path}, absolutePaths))
-		{
-			return EXIT_FAILURE;
-		}
-		QVector<QString> tags = tagManager.getTags(absolutePaths.at(0));
-		for(const QString &entry : tags)
-		{
-			Logger::info() << entry << Qt::endl;
-		}
-	}
-	return EXIT_SUCCESS;
-}
--- a/cli/commandtag.h
+++ b/cli/commandtag.h
@ -1,16 +0,0 @@
-#ifndef COMMANDTAG_H
-#define COMMANDTAG_H
-#include "command.h"
-
-class CommandTag : public Command
-{
-  protected:
-	bool ensureAbsolutePaths(const QVector<QString> &paths, QVector<QString> &absolutePaths);
-
-  public:
-	using Command::Command;
-
-	int handle(QStringList arguments) override;
-};
-
-#endif // COMMANDTAG_H
--- a/cli/commandupdate.cpp
+++ b/cli/commandupdate.cpp
@ -38,13 +38,10 @@ int CommandUpdate::handle(QStringList arguments)
 		QThreadPool::globalInstance()->setMaxThreadCount(threadsCount.toInt());
 	}

+	bool hasErrors = false;
 	IndexSyncer *syncer = new IndexSyncer(*this->dbService);
-
-	FileSaverOptions fileOptions;
-	fileOptions.keepGoing = keepGoing;
-	fileOptions.verbose = verbose;
-
-	syncer->setFileSaverOptions(fileOptions);
+	syncer->setKeepGoing(keepGoing);
+	syncer->setVerbose(verbose);
 	syncer->setPattern(pattern);
 	syncer->setDryRun(dryRun);
 	syncer->setRemoveDeletedFromIndex(deleteMissing);
@ -63,7 +60,7 @@ int CommandUpdate::handle(QStringList arguments)
 		/* TODO: updated not printed, handled be verbose in FileSaver, but this can be improved */
 	}
 	connect(syncer, &IndexSyncer::finished, this,
-			[this, dryRun, keepGoing](unsigned int totalUpdated, unsigned int totalRemoved, unsigned int totalErrors)
+			[&](unsigned int totalUpdated, unsigned int totalRemoved, unsigned int totalErrors)
 			{
 				Logger::info() << "Syncing finished" << Qt::endl;

@ -75,7 +72,7 @@ int CommandUpdate::handle(QStringList arguments)
 				}

 				int retval = 0;
-				if(this->hasErrors && !keepGoing)
+				if(hasErrors && !keepGoing)
 				{
 					retval = 1;
 				}
@ -85,7 +82,7 @@ int CommandUpdate::handle(QStringList arguments)
 			[&](QString error)
 			{
 				Logger::error() << error << Qt::endl;
-				this->hasErrors = true;
+				hasErrors = true;
 			});

 	this->autoFinish = false;
--- a/cli/commandupdate.h
+++ b/cli/commandupdate.h
@ -4,9 +4,6 @@
 #include "filesaver.h"
 class CommandUpdate : public Command
 {
-  protected:
-	bool hasErrors = false;
-
  public:
 	using Command::Command;
 	int handle(QStringList arguments) override;
--- a/cli/main.cpp
+++ b/cli/main.cpp
@ -21,7 +21,6 @@
 #include "commandupdate.h"
 #include "commandsearch.h"
 #include "commandlist.h"
-#include "commandtag.h"
 #include "databasefactory.h"
 #include "logger.h"
 #include "sandboxedprocessor.h"
@ -32,7 +31,7 @@
 void printUsage(QString argv0)
 {
 	qInfo() << "Usage:" << argv0 << "command";
-	qInfo() << "Valid commands: add, update, search, delete, tag, list. Each command has a --help option.";
+	qInfo() << "Valid commands: add, update, delete, search, list. Each command has a --help option.";
 }

 Command *commandFromName(QString name, SqliteDbService &dbService)
@ -57,10 +56,6 @@ Command *commandFromName(QString name, SqliteDbService &dbService)
 	{
 		return new CommandList(dbService);
 	}
-	if(name == "tag")
-	{
-		return new CommandTag(dbService);
-	}

 	return nullptr;
 }
--- a/gui/gui.pro
+++ b/gui/gui.pro
@ -34,7 +34,6 @@ SOURCES += \
        main.cpp \
        mainwindow.cpp \
      clicklabel.cpp \
-    previewcoordinator.cpp \
    previewgenerator.cpp \
    previewgeneratormapfunctor.cpp \
    previewgeneratorodt.cpp \
@ -55,7 +54,6 @@ HEADERS += \
    ipcserver.h \
        mainwindow.h \
    clicklabel.h \
-    previewcoordinator.h \
    previewgenerator.h \
    previewgeneratormapfunctor.h \
    previewgeneratorodt.h \
--- a/gui/ipcpreviewworker.h
+++ b/gui/ipcpreviewworker.h
@ -18,10 +18,6 @@ class IPCPreviewWorker : public QObject
 	IPCPreviewWorker(QLocalSocket *peer);
 	void start(RenderConfig config, const QVector<RenderTarget> &targets);
 	void stop();
-	~IPCPreviewWorker()
-	{
-		delete this->peer;
-	}
  private slots:
 	void shutdownSocket();

--- a/gui/main.cpp
+++ b/gui/main.cpp
@ -28,7 +28,7 @@ void enableIpcSandbox()
 	policy->namespace_options = EXILE_UNSHARE_USER | EXILE_UNSHARE_MOUNT | EXILE_UNSHARE_NETWORK;
 	policy->no_new_privs = 1;
 	policy->drop_caps = 1;
-	policy->vow_promises = exile_vows_from_str("thread cpath rpath wpath unix stdio proc error");
+	policy->vow_promises = exile_vows_from_str("thread cpath rpath unix stdio proc error");
 	policy->mount_path_policies_to_chroot = 1;

 	QString ipcSocketPath = Common::ipcSocketPath();
@ -193,7 +193,7 @@ int main(int argc, char *argv[])
 															   Logger::error() << error << Qt::endl;
 															   QMessageBox::critical(nullptr, "Error during upgrade",
 																					 error);
-															   exit(EXIT_FAILURE);
+															   qApp->quit();
 														   }

 								 );
--- a/gui/mainwindow.cpp
+++ b/gui/mainwindow.cpp
@ -15,16 +15,14 @@
 #include <QFileDialog>
 #include <QScreen>
 #include <QProgressDialog>
-#include <QDesktopWidget>
-#include <QWidgetAction>
-#include <QInputDialog>
-
 #include "mainwindow.h"
 #include "ui_mainwindow.h"
 #include "clicklabel.h"
 #include "../shared/sqlitesearch.h"
 #include "../shared/looqsgeneralexception.h"
 #include "../shared/common.h"
+#include "ipcpreviewclient.h"
+#include "previewgenerator.h"
 #include "aboutdialog.h"

 MainWindow::MainWindow(QWidget *parent, QString socketPath)
@ -33,7 +31,8 @@ MainWindow::MainWindow(QWidget *parent, QString socketPath)
 	this->progressDialog.cancel(); // because constructing it shows it, quite weird
 	ui->setupUi(this);
 	setWindowTitle(QCoreApplication::applicationName());
-
+	this->ipcPreviewClient.moveToThread(&this->ipcClientThread);
+	this->ipcPreviewClient.setSocketPath(socketPath);
 	QSettings settings;

 	this->dbFactory = new DatabaseFactory(Common::databasePath());
@ -45,9 +44,6 @@ MainWindow::MainWindow(QWidget *parent, QString socketPath)

 	indexer = new Indexer(*(this->dbService));
 	indexer->setParent(this);
-
-	tagManager = new TagManager(*(this->dbService));
-
 	connectSignals();
 	ui->treeResultsList->setContextMenuPolicy(Qt::ContextMenuPolicy::CustomContextMenu);
 	ui->tabWidget->setCurrentIndex(0);
@ -81,7 +77,7 @@ MainWindow::MainWindow(QWidget *parent, QString socketPath)
 	ui->txtSearch->installEventFilter(this);
 	ui->scrollArea->viewport()->installEventFilter(this);

-	this->previewCoordinator.setSocketPath(socketPath);
+	this->ipcClientThread.start();
 }

 void MainWindow::addPathToIndex()
@ -153,7 +149,7 @@ void MainWindow::connectSignals()
 	connect(this->indexer, &Indexer::finished, this, &MainWindow::finishIndexing);

 	connect(ui->lstPaths->selectionModel(), &QItemSelectionModel::selectionChanged, this,
-			[&](const QItemSelection & /*selected*/, const QItemSelection & /*deselected*/)
+			[&](const QItemSelection &selected, const QItemSelection &deselected)
 			{ ui->btnDeletePath->setEnabled(this->ui->lstPaths->selectedItems().count() > 0); });

 	connect(ui->btnDeletePath, &QPushButton::clicked, this, [&] { qDeleteAll(ui->lstPaths->selectedItems()); });
@ -173,29 +169,30 @@ void MainWindow::connectSignals()
 				}
 			});
 	connect(ui->menuAboutAction, &QAction::triggered, this,
-			[this](bool /*checked*/)
+			[this](bool checked)
 			{
 				AboutDialog aboutDialog(this);

 				aboutDialog.exec();
 			});
 	connect(ui->menuAboutQtAction, &QAction::triggered, this,
-			[this](bool /*checked*/) { QMessageBox::aboutQt(this, "About Qt"); });
+			[this](bool checked) { QMessageBox::aboutQt(this, "About Qt"); });
 	connect(ui->menuSyncIndexAction, &QAction::triggered, this, &MainWindow::startIndexSync);
 	connect(ui->menuOpenUserManualAction, &QAction::triggered, this,
-			[]() { QDesktopServices::openUrl(Common::userManualUrl()); });
+			[this]() { QDesktopServices::openUrl(Common::userManualUrl()); });

-	connect(
-		indexSyncer, &IndexSyncer::finished, this,
-		[&](unsigned int totalUpdated, unsigned int totalDeleted, unsigned int totalErrored)
-		{
-			this->progressDialog.cancel();
+	connect(indexSyncer, &IndexSyncer::finished, this,
+			[&](unsigned int totalUpdated, unsigned int totalDeleted, unsigned int totalErrored)
+			{
+				this->progressDialog.cancel();

-			QMessageBox::information(
-				this, "Syncing finished",
-				QString("Syncing finished\n\nTotal updated: %1\nTotal deleted: %2\nTotal errors: %3\n")
-					.arg(QString::number(totalUpdated), QString::number(totalDeleted), QString::number(totalErrored)));
-		});
+				QMessageBox::information(
+					this, "Syncing finished",
+					QString("Syncing finished\n\nTotal updated: %1\nTotal deleted: %2\nTotal errors: %3\n")
+						.arg(QString::number(totalUpdated))
+						.arg(QString::number(totalDeleted))
+						.arg(QString::number(totalErrored)));
+			});
 	connect(this, &MainWindow::beginIndexSync, indexSyncer, &IndexSyncer::sync);
 	connect(&this->progressDialog, &QProgressDialog::canceled, indexSyncer, &IndexSyncer::cancel);
 	connect(ui->btnSaveSettings, &QPushButton::clicked, this, &MainWindow::saveSettings);
@ -210,9 +207,9 @@ void MainWindow::connectSignals()
 			}
 		},
 		Qt::QueuedConnection);
-	connect(&previewCoordinator, &PreviewCoordinator::previewReady, this, &MainWindow::previewReceived,
+	connect(&ipcPreviewClient, &IPCPreviewClient::previewReceived, this, &MainWindow::previewReceived,
 			Qt::QueuedConnection);
-	connect(&previewCoordinator, &PreviewCoordinator::completedGeneration, this,
+	connect(&ipcPreviewClient, &IPCPreviewClient::finished, this,
 			[&]
 			{
 				this->ui->previewProcessBar->setValue(this->ui->previewProcessBar->maximum());
@ -220,24 +217,22 @@ void MainWindow::connectSignals()
 				this->ui->comboPreviewFiles->setEnabled(true);
 				ui->txtSearch->setEnabled(true);
 			});
-	connect(&previewCoordinator, &PreviewCoordinator::error, this,
+	connect(&ipcPreviewClient, &IPCPreviewClient::error, this,
 			[this](QString msg)
 			{
 				qCritical() << msg << Qt::endl;
 				QMessageBox::critical(this, "IPC error", msg);
 			});
-	connect(ui->radioMetadataOnly, &QRadioButton::toggled, this,
-			[this](bool toggled)
-			{
-				if(toggled)
-				{
-					this->ui->chkFillContentForContentless->setChecked(false);
-				};
-			});
+
+	connect(this, &MainWindow::startIpcPreviews, &ipcPreviewClient, &IPCPreviewClient::startGeneration,
+			Qt::QueuedConnection);
+	connect(this, &MainWindow::stopIpcPreviews, &ipcPreviewClient, &IPCPreviewClient::stopGeneration,
+			Qt::QueuedConnection);
 }

 void MainWindow::exportFailedPaths()
 {
+
 	QString filename =
 		QString("/tmp/looqs_indexresult_failed_%1").arg(QDateTime::currentDateTime().toString("yyyy-MM-dd_hhmmss"));
 	QFile outFile(filename);
@ -270,11 +265,8 @@ void MainWindow::startIndexSync()
 	progressDialog.setValue(0);
 	progressDialog.open();

-	FileSaverOptions options;
-	options.keepGoing = true;
-	options.verbose = false;
-
-	indexSyncer->setFileSaverOptions(options);
+	indexSyncer->setKeepGoing(true);
+	indexSyncer->setVerbose(false);
 	indexSyncer->setDryRun(false);
 	indexSyncer->setRemoveDeletedFromIndex(true);

@ -293,7 +285,6 @@ void MainWindow::startIndexing()
 	if(this->indexer->isRunning())
 	{
 		ui->btnStartIndexing->setEnabled(false);
-
 		ui->btnStartIndexing->setText("Start indexing");
 		this->indexer->requestCancellation();
 		return;
@ -303,8 +294,6 @@ void MainWindow::startIndexing()
 	ui->resultsTab->setEnabled(false);
 	ui->settingsTab->setEnabled(false);
 	ui->txtPathScanAdd->setEnabled(false);
-	ui->btnAddPath->setEnabled(false);
-	ui->btnChoosePath->setEnabled(false);
 	ui->txtSearch->setEnabled(false);
 	ui->previewProcessBar->setValue(0);
 	ui->previewProcessBar->setVisible(true);
@ -321,15 +310,6 @@ void MainWindow::startIndexing()
 	this->indexer->setTargetPaths(paths);
 	QString ignorePatterns = ui->txtIgnorePatterns->text();
 	this->indexer->setIgnorePattern(ignorePatterns.split(";"));
-
-	FileSaverOptions options;
-	options.fillExistingContentless =
-		ui->chkFillContentForContentless->isEnabled() && ui->chkFillContentForContentless->isChecked();
-	options.metadataOnly = ui->radioMetadataOnly->isChecked();
-	options.verbose = false;
-	options.keepGoing = true;
-
-	this->indexer->setFileSaverOptions(options);
 	this->indexer->beginIndexing();
 	QSettings settings;
 	settings.setValue("indexPaths", pathSettingsValue);
@ -352,8 +332,6 @@ void MainWindow::finishIndexing()
 	ui->resultsTab->setEnabled(true);
 	ui->settingsTab->setEnabled(true);
 	ui->txtPathScanAdd->setEnabled(true);
-	ui->btnAddPath->setEnabled(true);
-	ui->btnChoosePath->setEnabled(true);
 	ui->txtSearch->setEnabled(true);
 	if(result.erroredPaths > 0)
 	{
@ -361,7 +339,7 @@ void MainWindow::finishIndexing()
 	}
 }

-void MainWindow::comboScaleChanged(int /*i*/)
+void MainWindow::comboScaleChanged(int i)
 {
 	QSettings scaleSetting;
 	scaleSetting.setValue("currentScale", ui->comboScale->currentText());
@ -407,8 +385,7 @@ void MainWindow::processShortcut(int key)
 	{
 		ui->txtSearch->setFocus();
 		QString currentText = ui->txtSearch->text().trimmed();
-		static QRegularExpression separatorRegex("[\\s\\)]");
-		int index = currentText.lastIndexOf(separatorRegex);
+		int index = currentText.lastIndexOf(QRegularExpression("[\\s\\)]"));
 		if(index != -1)
 		{
 			bool isFilter = (index == currentText.length() - 1);
@ -654,26 +631,22 @@ void MainWindow::saveSettings()
 	qApp->quit();
 }

-void MainWindow::previewReceived()
+void MainWindow::previewReceived(QSharedPointer<PreviewResult> preview, unsigned int previewGeneration)
 {
-	this->ui->previewProcessBar->setValue(this->ui->previewProcessBar->value() + 1);
-	QBoxLayout *layout = static_cast<QBoxLayout *>(ui->scrollAreaWidgetContents->layout());
-	int index = layout->count();
-	if(index > 0)
+	if(previewGeneration < this->currentPreviewGeneration)
 	{
-		--index;
+		return;
 	}
-	QSharedPointer<PreviewResult> preview = this->previewCoordinator.resultAt(index);
-
+	this->ui->previewProcessBar->setValue(this->ui->previewProcessBar->value() + 1);
 	if(!preview.isNull() && preview->hasPreview())
 	{
 		QString docPath = preview->getDocumentPath();
 		auto previewPage = preview->getPage();
+
 		ClickLabel *headerLabel = new ClickLabel();
 		headerLabel->setText(QString("Path: ") + preview->getDocumentPath());

 		ClickLabel *label = dynamic_cast<ClickLabel *>(preview->createPreviewWidget());
-		label->setMaximumWidth(QApplication::desktop()->availableGeometry().width() - 200);

 		QVBoxLayout *previewLayout = new QVBoxLayout();

@ -687,8 +660,8 @@ void MainWindow::previewReceived()
 		{
 			QFileInfo fileInfo{docPath};
 			QMenu menu("labeRightClick", this);
-			createSearchResultMenu(menu, fileInfo);
-			menu.addAction("Copy page number", this,
+			createSearchResutlMenu(menu, fileInfo);
+			menu.addAction("Copy page number",
 						   [previewPage] { QGuiApplication::clipboard()->setText(QString::number(previewPage)); });
 			menu.exec(QCursor::pos());
 		};
@ -705,12 +678,11 @@ void MainWindow::previewReceived()
 		previewLayout->setMargin(0);
 		previewLayout->insertStretch(0, 1);
 		previewLayout->insertStretch(-1, 1);
-		previewLayout->setAlignment(Qt::AlignCenter);
 		QWidget *previewWidget = new QWidget();

 		previewWidget->setLayout(previewLayout);

-		layout->insertWidget(index, previewWidget);
+		ui->scrollAreaWidgetContents->layout()->addWidget(previewWidget);
 	}
 }

@ -827,15 +799,13 @@ void MainWindow::lineEditReturnPressed()

 void MainWindow::handleSearchResults(const QVector<SearchResult> &results)
 {
+	this->previewableSearchResults.clear();
 	qDeleteAll(ui->scrollAreaWidgetContents->children());

 	ui->treeResultsList->clear();
 	ui->comboPreviewFiles->clear();
 	ui->comboPreviewFiles->addItem("All previews");
 	ui->comboPreviewFiles->setVisible(true);
-	ui->lblTotalPreviewPagesCount->setText("");
-
-	this->previewCoordinator.init(results);

 	bool hasDeleted = false;
 	QHash<QString, bool> seenMap;
@ -846,6 +816,7 @@ void MainWindow::handleSearchResults(const QVector<SearchResult> &results)

 		if(!seenMap.contains(absPath))
 		{
+			seenMap[absPath] = true;
 			QString fileName = pathInfo.fileName();
 			QTreeWidgetItem *item = new QTreeWidgetItem(ui->treeResultsList);

@ -857,29 +828,32 @@ void MainWindow::handleSearchResults(const QVector<SearchResult> &results)
 			item->setText(3, this->locale().formattedDataSize(result.fileData.size));
 		}
 		bool exists = pathInfo.exists();
-		if(!exists)
+		if(exists)
+		{
+			if(!result.wasContentSearch)
+			{
+				continue;
+			}
+
+			if(!pathInfo.suffix().contains("htm")) // hack until we can preview them properly...
+			{
+				if(PreviewGenerator::get(pathInfo) != nullptr)
+				{
+					this->previewableSearchResults.append(result);
+					ui->comboPreviewFiles->addItem(result.fileData.absPath);
+				}
+			}
+		}
+		else
 		{
 			hasDeleted = true;
 		}
-		seenMap[absPath] = true;
-	}
-
-	seenMap.clear();
-	for(const SearchResult &result : this->previewCoordinator.getPreviewableSearchResults())
-	{
-		const QString &absPath = result.fileData.absPath;
-		if(!seenMap.contains(absPath))
-		{
-			ui->comboPreviewFiles->addItem(absPath);
-		}
-		seenMap[absPath] = true;
 	}

 	ui->treeResultsList->resizeColumnToContents(0);
 	ui->treeResultsList->resizeColumnToContents(1);
 	ui->treeResultsList->resizeColumnToContents(2);
-
-	previewDirty = this->previewCoordinator.previewableCount() > 0;
+	previewDirty = !this->previewableSearchResults.empty();

 	ui->spinPreviewPage->setValue(1);

@ -888,10 +862,7 @@ void MainWindow::handleSearchResults(const QVector<SearchResult> &results)
 		makePreviews(1);
 	}

-	ui->tabWidget->setTabEnabled(1, previewDirty);
-
 	QString statusText = "Results: " + QString::number(results.size()) + " files";
-	statusText += ", previewable: " + QString::number(this->previewCoordinator.previewableCount());
 	if(hasDeleted)
 	{
 		statusText += " WARNING: Some files are inaccessible. No preview available for those. Index may be out of sync";
@ -908,7 +879,7 @@ int MainWindow::currentSelectedScale()

 void MainWindow::makePreviews(int page)
 {
-	if(this->previewCoordinator.previewableCount() == 0)
+	if(this->previewableSearchResults.empty())
 	{
 		return;
 	}
@ -925,10 +896,11 @@ void MainWindow::makePreviews(int page)
 		ui->scrollAreaWidgetContents->setLayout(new QVBoxLayout());
 		ui->scrollAreaWidgetContents->layout()->setAlignment(Qt::AlignCenter);
 	}
-	ui->previewProcessBar->setMaximum(this->previewCoordinator.previewableCount());
+	ui->previewProcessBar->setMaximum(this->previewableSearchResults.size());
+	processedPdfPreviews = 0;

 	QVector<QString> wordsToHighlight;
-	static QRegularExpression extractor(R"#("([^"]*)"|([^\s]+))#");
+	QRegularExpression extractor(R"#("([^"]*)"|([^\s]+))#");
 	for(const Token &token : this->contentSearchQuery.getTokens())
 	{
 		if(token.type == FILTER_CONTENT_CONTAINS)
@ -946,12 +918,12 @@ void MainWindow::makePreviews(int page)
 			}
 		}
 	}
-	int length = previewsPerPage;
-	int beginOffset = page * previewsPerPage - previewsPerPage;
-	if(beginOffset < 0)
+	int end = previewsPerPage;
+	int begin = page * previewsPerPage - previewsPerPage;
+	if(begin < 0)
 	{
 		// Should not happen actually
-		beginOffset = 0;
+		begin = 0;
 	}

 	int currentScale = currentSelectedScale();
@ -961,7 +933,7 @@ void MainWindow::makePreviews(int page)
 	renderConfig.wordsToHighlight = wordsToHighlight;

 	QVector<RenderTarget> targets;
-	for(const SearchResult &sr : this->previewCoordinator.getPreviewableSearchResults())
+	for(SearchResult &sr : this->previewableSearchResults)
 	{
 		if(ui->comboPreviewFiles->currentIndex() != 0)
 		{
@ -973,23 +945,22 @@ void MainWindow::makePreviews(int page)
 		RenderTarget renderTarget;
 		renderTarget.path = sr.fileData.absPath;
 		renderTarget.page = (int)sr.page;
-
 		targets.append(renderTarget);
 	}
 	int numpages = ceil(static_cast<double>(targets.size()) / previewsPerPage);
 	ui->spinPreviewPage->setMaximum(numpages);
-	targets = targets.mid(beginOffset, length);
+	targets = targets.mid(begin, end);

 	ui->lblTotalPreviewPagesCount->setText(QString::number(numpages));
 	ui->previewProcessBar->setMaximum(targets.count());
 	ui->previewProcessBar->setMinimum(0);
 	ui->previewProcessBar->setValue(0);
-	ui->previewProcessBar->setVisible(this->previewCoordinator.previewableCount() > 0);
+	ui->previewProcessBar->setVisible(this->previewableSearchResults.size() > 0);
+	++this->currentPreviewGeneration;
 	this->ui->spinPreviewPage->setEnabled(false);
 	this->ui->comboPreviewFiles->setEnabled(false);
 	this->ui->txtSearch->setEnabled(false);
-
-	this->previewCoordinator.startGeneration(renderConfig, targets);
+	emit startIpcPreviews(renderConfig, targets);
 }

 void MainWindow::handleSearchError(QString error)
@ -997,87 +968,27 @@ void MainWindow::handleSearchError(QString error)
 	ui->lblSearchResults->setText("Error:" + error);
 }

-void MainWindow::createSearchResultMenu(QMenu &menu, const QFileInfo &fileInfo)
+void MainWindow::createSearchResutlMenu(QMenu &menu, const QFileInfo &fileInfo)
 {
-	menu.addAction("Copy filename to clipboard", this,
+	menu.addAction("Copy filename to clipboard",
 				   [&fileInfo] { QGuiApplication::clipboard()->setText(fileInfo.fileName()); });
-	menu.addAction("Copy full path to clipboard", this,
+	menu.addAction("Copy full path to clipboard",
 				   [&fileInfo] { QGuiApplication::clipboard()->setText(fileInfo.absoluteFilePath()); });
-	menu.addAction("Open containing folder", this, [this, &fileInfo] { this->openFile(fileInfo.absolutePath()); });
+	menu.addAction("Open containing folder", [this, &fileInfo] { this->openFile(fileInfo.absolutePath()); });

-	auto previewables = this->previewCoordinator.getPreviewableSearchResults();
 	auto result =
-		std::find_if(previewables.begin(), previewables.end(),
-					 [&fileInfo](SearchResult &a) { return fileInfo.absoluteFilePath() == a.fileData.absPath; });
+		std::find_if(this->previewableSearchResults.begin(), this->previewableSearchResults.end(),
+					 [this, &fileInfo](SearchResult &a) { return fileInfo.absoluteFilePath() == a.fileData.absPath; });

-	if(result != previewables.end())
+	if(result != this->previewableSearchResults.end())
 	{
-		menu.addAction("Show previews for this file", this,
+		menu.addAction("Show previews for this file",
 					   [this, &fileInfo]
 					   {
 						   ui->tabWidget->setCurrentIndex(1);
 						   this->ui->comboPreviewFiles->setCurrentText(fileInfo.absoluteFilePath());
 					   });
 	}
-
-	QMenu *tagMenu = menu.addMenu("Tag file with: ");
-	QVector<QString> allTags = this->dbService->getTags();
-	QHash<QString, bool> fileTags;
-
-	QString path = fileInfo.absoluteFilePath();
-
-	for(const QString &fileTag : this->dbService->getTagsForPath(path))
-	{
-		fileTags[fileTag] = true;
-	}
-
-	for(const QString &tag : allTags)
-	{
-		QCheckBox *checkBox = new QCheckBox(tagMenu);
-		QWidgetAction *checkableAction = new QWidgetAction(tagMenu);
-		checkableAction->setDefaultWidget(checkBox);
-		checkBox->setText(tag);
-		checkBox->setChecked(fileTags.contains(tag));
-		tagMenu->addAction(checkableAction);
-
-		connect(checkBox, &QCheckBox::stateChanged, this,
-				[this, checkBox, path]
-				{
-					QVector<QString> currentTags = this->dbService->getTagsForPath(path);
-					QString checkBoxText = checkBox->text();
-					if(checkBox->isChecked())
-					{
-						if(!this->tagManager->addTagsToPath(path, {checkBoxText}))
-						{
-							QMessageBox::critical(this, "Error while adding tag",
-												  "An error occured while trying to add the tag");
-						}
-					}
-					else
-					{
-						if(!this->tagManager->removeTagsForPath(path, {checkBoxText}))
-						{
-							QMessageBox::critical(this, "Error while removing tag",
-												  "An error occured while trying to remove the tag");
-						}
-					}
-				});
-	}
-
-	tagMenu->addAction("Add new tags", this,
-					   [this, path]
-					   {
-						   bool ok;
-						   QString text =
-							   QInputDialog::getText(this, tr("Enter new tags"), tr("New tags (comma separated):"),
-													 QLineEdit::Normal, "", &ok);
-
-						   if(ok && !this->tagManager->addTagsToPath(path, text, ','))
-						   {
-							   QMessageBox::critical(this, "Error while trying to add tags",
-													 "An error occured while trying to add tags");
-						   }
-					   });
 }

 void MainWindow::openDocument(QString path, int num)
@ -1107,7 +1018,7 @@ void MainWindow::openFile(QString path)
 	QDesktopServices::openUrl(QUrl::fromLocalFile(path));
 }

-void MainWindow::treeSearchItemActivated(QTreeWidgetItem *item, int /*i*/)
+void MainWindow::treeSearchItemActivated(QTreeWidgetItem *item, int i)
 {
 	openFile(item->text(1));
 }
@ -1121,22 +1032,22 @@ void MainWindow::showSearchResultsContextMenu(const QPoint &point)
 	}
 	QFileInfo pathinfo(item->text(1));
 	QMenu menu("SearchResults", this);
-	createSearchResultMenu(menu, pathinfo);
+	createSearchResutlMenu(menu, pathinfo);
 	menu.exec(QCursor::pos());
 }

 MainWindow::~MainWindow()
 {
 	syncerThread.terminate();
+	ipcClientThread.terminate();
 	delete this->indexSyncer;
 	delete this->dbService;
 	delete this->dbFactory;
 	delete this->indexer;
-	delete this->tagManager;
 	delete ui;
 }

-void MainWindow::closeEvent(QCloseEvent * /*event*/)
+void MainWindow::closeEvent(QCloseEvent *event)
 {
 	QStringList list = this->searchHistory.toList();
 	QSettings settings;
--- a/gui/mainwindow.h
+++ b/gui/mainwindow.h
@ -12,9 +12,8 @@
 #include <QProgressDialog>
 #include "../shared/looqsquery.h"
 #include "../shared/indexsyncer.h"
-#include "previewcoordinator.h"
+#include "ipcpreviewclient.h"
 #include "indexer.h"
-#include "tagmanager.h"
 namespace Ui
 {
 class MainWindow;
@ -24,51 +23,60 @@ class MainWindow : public QMainWindow
 {
 	Q_OBJECT

+  public:
+	explicit MainWindow(QWidget *parent, QString socketPath);
+	~MainWindow();
+  signals:
+	void beginSearch(const QString &query);
+	void startPdfPreviewGeneration(QVector<SearchResult> paths, double scalefactor);
+
+  protected:
+	void closeEvent(QCloseEvent *event) override;
+
  private:
 	DatabaseFactory *dbFactory;
 	SqliteDbService *dbService;
 	Ui::MainWindow *ui;
-
-	PreviewCoordinator previewCoordinator;
-
+	IPCPreviewClient ipcPreviewClient;
+	QThread ipcClientThread;
 	QThread syncerThread;
-	Indexer *indexer;
 	IndexSyncer *indexSyncer;
 	QProgressDialog progressDialog;
+
+	Indexer *indexer;
 	QFileIconProvider iconProvider;
+	bool previewDirty;
 	QSqlDatabase db;
 	QFutureWatcher<QVector<SearchResult>> searchWatcher;
-	LooqsQuery contentSearchQuery;
-	QVector<QString> searchHistory;
-
-	TagManager *tagManager;
-
-	int currentSearchHistoryIndex = 0;
-	QString currentSavedSearchText;
-	bool previewDirty = false;
-	int previewsPerPage = 20;
-
+	void add(QString path, unsigned int page);
+	QVector<SearchResult> previewableSearchResults;
 	void connectSignals();
 	void makePreviews(int page);
 	bool previewTabActive();
 	bool indexerTabActive();
 	void keyPressEvent(QKeyEvent *event) override;
+	unsigned int processedPdfPreviews;
 	void handleSearchResults(const QVector<SearchResult> &results);
 	void handleSearchError(QString error);
-	void createSearchResultMenu(QMenu &menu, const QFileInfo &fileInfo);
+	LooqsQuery contentSearchQuery;
+	int previewsPerPage;
+	void createSearchResutlMenu(QMenu &menu, const QFileInfo &fileInfo);
 	void openDocument(QString path, int num);
 	void openFile(QString path);
+	unsigned int currentPreviewGeneration = 1;
 	void initSettingsTabs();
 	int currentSelectedScale();
 	void processShortcut(int key);
-	bool eventFilter(QObject *object, QEvent *event) override;
-
+	bool eventFilter(QObject *object, QEvent *event);
+	QVector<QString> searchHistory;
+	int currentSearchHistoryIndex = 0;
+	QString currentSavedSearchText;
  private slots:
 	void lineEditReturnPressed();
 	void treeSearchItemActivated(QTreeWidgetItem *item, int i);
 	void showSearchResultsContextMenu(const QPoint &point);
 	void tabChanged();
-	void previewReceived();
+	void previewReceived(QSharedPointer<PreviewResult> preview, unsigned int previewGeneration);
 	void comboScaleChanged(int i);
 	void spinPreviewPageValueChanged(int val);
 	void startIndexing();
@ -82,16 +90,6 @@ class MainWindow : public QMainWindow
 	void startIpcPreviews(RenderConfig config, const QVector<RenderTarget> &targets);
 	void stopIpcPreviews();
 	void beginIndexSync();
-
-  public:
-	explicit MainWindow(QWidget *parent, QString socketPath);
-	~MainWindow();
-  signals:
-	void beginSearch(const QString &query);
-	void startPdfPreviewGeneration(QVector<SearchResult> paths, double scalefactor);
-
-  protected:
-	void closeEvent(QCloseEvent *event) override;
 };

 #endif // MAINWINDOW_H
--- a/gui/mainwindow.ui
+++ b/gui/mainwindow.ui
@ -7,7 +7,7 @@
    <x>0</x>
    <y>0</y>
    <width>1280</width>
-    <height>923</height>
+    <height>888</height>
   </rect>
  </property>
  <property name="windowTitle">
@ -18,13 +18,16 @@
    <item>
     <widget class="QLineEdit" name="txtSearch"/>
    </item>
+    <item>
+     <layout class="QHBoxLayout" name="horizontalLayout_3"/>
+    </item>
    <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="tabPosition">
       <enum>QTabWidget::South</enum>
      </property>
      <property name="currentIndex">
-       <number>2</number>
+       <number>3</number>
      </property>
      <widget class="QWidget" name="resultsTab">
       <attribute name="title">
@ -79,7 +82,7 @@
             <x>0</x>
             <y>0</y>
             <width>1244</width>
-             <height>641</height>
+             <height>598</height>
            </rect>
           </property>
           <layout class="QHBoxLayout" name="horizontalLayout"/>
@ -162,7 +165,7 @@
          <item>
           <widget class="QComboBox" name="comboPreviewFiles">
            <property name="sizePolicy">
-             <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+             <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
@ -192,6 +195,62 @@
       </attribute>
       <layout class="QGridLayout" name="gridLayout">
        <item row="6" column="0">
+         <widget class="QLineEdit" name="txtIgnorePatterns"/>
+        </item>
+        <item row="11" column="0">
+         <widget class="QPushButton" name="btnStartIndexing">
+          <property name="text">
+           <string>Start indexing</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="0">
+         <widget class="QGroupBox" name="groupBoxPaths">
+          <property name="title">
+           <string>Add paths to scan</string>
+          </property>
+          <layout class="QGridLayout" name="gridLayout_2">
+           <item row="1" column="0">
+            <widget class="QLineEdit" name="txtPathScanAdd"/>
+           </item>
+           <item row="3" column="0" colspan="5">
+            <widget class="QListWidget" name="lstPaths"/>
+           </item>
+           <item row="1" column="3">
+            <widget class="QToolButton" name="btnDeletePath">
+             <property name="enabled">
+              <bool>false</bool>
+             </property>
+             <property name="text">
+              <string>Delete</string>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="1">
+            <widget class="QPushButton" name="btnChoosePath">
+             <property name="text">
+              <string>...</string>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="2">
+            <widget class="QPushButton" name="btnAddPath">
+             <property name="text">
+              <string>Add</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </widget>
+        </item>
+        <item row="5" column="0">
+         <widget class="QLabel" name="label">
+          <property name="text">
+           <string>Ignore patterns, separated by ';'. Example: *.js;*Downloads*</string>
+          </property>
+         </widget>
+        </item>
+        <item row="9" column="0">
         <widget class="QGroupBox" name="groupBoxIndexProgress">
          <property name="contextMenuPolicy">
           <enum>Qt::PreventContextMenu</enum>
@ -393,108 +452,6 @@
          </layout>
         </widget>
        </item>
-        <item row="2" column="0">
-         <widget class="QGroupBox" name="groupBoxIndexOptions">
-          <property name="title">
-           <string>Index options</string>
-          </property>
-          <layout class="QVBoxLayout" name="verticalLayout_11">
-           <item>
-            <widget class="QLabel" name="label">
-             <property name="text">
-              <string>Ignore patterns, separated by ';'. Example: *.js;*Downloads*:</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QLineEdit" name="txtIgnorePatterns"/>
-           </item>
-           <item>
-            <widget class="Line" name="line">
-             <property name="orientation">
-              <enum>Qt::Horizontal</enum>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QRadioButton" name="radioIndexEverything">
-             <property name="text">
-              <string>Index everything (metadata + file content)</string>
-             </property>
-             <property name="checked">
-              <bool>true</bool>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QCheckBox" name="chkFillContentForContentless">
-             <property name="enabled">
-              <bool>true</bool>
-             </property>
-             <property name="text">
-              <string>Index content for files previously indexed without content</string>
-             </property>
-             <property name="checked">
-              <bool>false</bool>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QRadioButton" name="radioMetadataOnly">
-             <property name="text">
-              <string>Index metadata only, don't process content of files</string>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </widget>
-        </item>
-        <item row="8" column="0">
-         <widget class="QPushButton" name="btnStartIndexing">
-          <property name="text">
-           <string>Start indexing</string>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="0">
-         <widget class="QGroupBox" name="groupBoxPaths">
-          <property name="title">
-           <string>Add paths to scan</string>
-          </property>
-          <layout class="QGridLayout" name="gridLayout_2">
-           <item row="1" column="0">
-            <widget class="QLineEdit" name="txtPathScanAdd"/>
-           </item>
-           <item row="3" column="0" colspan="5">
-            <widget class="QListWidget" name="lstPaths"/>
-           </item>
-           <item row="1" column="3">
-            <widget class="QToolButton" name="btnDeletePath">
-             <property name="enabled">
-              <bool>false</bool>
-             </property>
-             <property name="text">
-              <string>Delete</string>
-             </property>
-            </widget>
-           </item>
-           <item row="1" column="1">
-            <widget class="QPushButton" name="btnChoosePath">
-             <property name="text">
-              <string>...</string>
-             </property>
-            </widget>
-           </item>
-           <item row="1" column="2">
-            <widget class="QPushButton" name="btnAddPath">
-             <property name="text">
-              <string>Add</string>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </widget>
-        </item>
       </layout>
      </widget>
      <widget class="QWidget" name="settingsTab">
@ -744,22 +701,5 @@
 </widget>
 <layoutdefault spacing="6" margin="11"/>
 <resources/>
- <connections>
-  <connection>
-   <sender>radioIndexEverything</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>chkFillContentForContentless</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>639</x>
-     <y>464</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>639</x>
-     <y>497</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
+ <connections/>
 </ui>
--- a/gui/previewcoordinator.cpp
+++ b/gui/previewcoordinator.cpp
@ -1,97 +0,0 @@
-#include "previewcoordinator.h"
-#include <QFileInfo>
-
-PreviewCoordinator::PreviewCoordinator()
-{
-	this->ipcPreviewClient.moveToThread(&this->ipcClientThread);
-
-	connect(&ipcPreviewClient, &IPCPreviewClient::previewReceived, this, &PreviewCoordinator::handleReceivedPreview,
-			Qt::QueuedConnection);
-	connect(&ipcPreviewClient, &IPCPreviewClient::finished, this, [&] { emit completedGeneration(); });
-	connect(this, &PreviewCoordinator::ipcStartGeneration, &ipcPreviewClient, &IPCPreviewClient::startGeneration,
-			Qt::QueuedConnection);
-
-	this->ipcClientThread.start();
-}
-
-void PreviewCoordinator::init(const QVector<SearchResult> &searchResults)
-{
-	this->previewableSearchResults.clear();
-	for(const SearchResult &result : searchResults)
-	{
-		if(result.wasContentSearch)
-		{
-			QString path = result.fileData.absPath;
-			// HACK until we can preview them properly
-			if(path.endsWith(".html") || path.endsWith(".htm"))
-			{
-				continue;
-			}
-			QFileInfo info{path};
-			if(info.exists())
-			{
-				this->previewableSearchResults.append(result);
-			}
-		}
-	}
-}
-
-void PreviewCoordinator::setSocketPath(QString socketPath)
-{
-	this->socketPath = socketPath;
-	this->ipcPreviewClient.setSocketPath(socketPath);
-}
-
-int PreviewCoordinator::previewableCount() const
-{
-	return this->previewableSearchResults.count();
-}
-
-QSharedPointer<PreviewResult> PreviewCoordinator::resultAt(int index)
-{
-	if(this->previewResults.size() > index)
-	{
-		return {this->previewResults[index]};
-	}
-	return {nullptr};
-}
-
-const QVector<SearchResult> &PreviewCoordinator::getPreviewableSearchResults() const
-{
-	return this->previewableSearchResults;
-}
-
-void PreviewCoordinator::handleReceivedPreview(QSharedPointer<PreviewResult> preview, unsigned int previewGeneration)
-{
-	if(previewGeneration < this->currentPreviewGeneration)
-	{
-		return;
-	}
-	if(!preview.isNull() && preview->hasPreview())
-	{
-		QString docPath = preview->getDocumentPath();
-		auto previewPage = preview->getPage();
-		int pos = previewOrder[docPath + QString::number(previewPage)];
-		this->previewResults[pos] = preview;
-		emit previewReady();
-	}
-}
-
-void PreviewCoordinator::startGeneration(RenderConfig config, const QVector<RenderTarget> &targets)
-{
-	++this->currentPreviewGeneration;
-
-	this->previewOrder.clear();
-	this->previewResults.clear();
-
-	this->previewResults.resize(targets.size());
-	this->previewResults.fill(nullptr);
-
-	int i = 0;
-	for(const RenderTarget &target : targets)
-	{
-		this->previewOrder[target.path + QString::number(target.page)] = i++;
-	}
-
-	emit ipcStartGeneration(config, targets);
-}
--- a/gui/previewcoordinator.h
+++ b/gui/previewcoordinator.h
@ -1,48 +0,0 @@
-#ifndef PREVIEWCOORDINATOR_H
-#define PREVIEWCOORDINATOR_H
-#include <QVector>
-#include <QObject>
-#include <QThread>
-#include "searchresult.h"
-#include "previewresult.h"
-#include "ipcpreviewclient.h"
-#include "rendertarget.h"
-class PreviewCoordinator : public QObject
-{
-	Q_OBJECT
-  private:
-	QThread ipcClientThread;
-	IPCPreviewClient ipcPreviewClient;
-	QString socketPath;
-
-	QVector<QSharedPointer<PreviewResult>> previewResults;
-	QVector<SearchResult> previewableSearchResults;
-
-	unsigned int currentPreviewGeneration = 1;
-
-	/* Quick lookup table for the order a preview should have */
-	QHash<QString, int> previewOrder;
-
-  public:
-	PreviewCoordinator();
-
-	void init(const QVector<SearchResult> &searchResults);
-
-	int previewableCount() const;
-	const QVector<SearchResult> &getPreviewableSearchResults() const;
-
-	QSharedPointer<PreviewResult> resultAt(int index);
-
-	void setSocketPath(QString socketPath);
-  public slots:
-	void startGeneration(RenderConfig config, const QVector<RenderTarget> &targets);
-	void handleReceivedPreview(QSharedPointer<PreviewResult> preview, unsigned int previewGeneration);
-
-  signals:
-	void previewReady();
-	void completedGeneration();
-	void error(QString);
-	void ipcStartGeneration(RenderConfig config, const QVector<RenderTarget> &targets);
-};
-
-#endif // PREVIEWCOORDINATOR_H
--- a/gui/previewgenerator.cpp
+++ b/gui/previewgenerator.cpp
@ -1,24 +1,20 @@
 #include "../shared/common.h"
 #include "previewgenerator.h"
-#include <QMutexLocker>
 #include "previewgeneratorpdf.h"
 #include "previewgeneratorplaintext.h"
 #include "previewgeneratorodt.h"

 static PreviewGenerator *plainTextGenerator = new PreviewGeneratorPlainText();

-static QHash<QString, PreviewGenerator *> generators{
+static QMap<QString, PreviewGenerator *> generators{
 	{"pdf", new PreviewGeneratorPdf()}, {"txt", plainTextGenerator},  {"md", plainTextGenerator},
 	{"py", plainTextGenerator},			{"java", plainTextGenerator}, {"js", plainTextGenerator},
 	{"cpp", plainTextGenerator},		{"c", plainTextGenerator},	  {"sql", plainTextGenerator},
 	{"odt", new PreviewGeneratorOdt()}};

-static QMutex generatorsMutex;
 PreviewGenerator *PreviewGenerator::get(QFileInfo &info)
 {
-	QMutexLocker locker(&generatorsMutex);
 	PreviewGenerator *result = generators.value(info.suffix(), nullptr);
-	locker.unlock();
 	if(result == nullptr)
 	{
 		if(Common::isTextFile(info))
--- a/gui/previewgeneratorodt.cpp
+++ b/gui/previewgeneratorodt.cpp
@ -24,7 +24,7 @@ QSharedPointer<PreviewResult> PreviewGeneratorOdt::generate(RenderConfig config,
 		throw LooqsGeneralException("Error while reading content.xml of " + documentPath);
 	}
 	TagStripperProcessor tsp;
-	QString content = tsp.process(entireContent).constFirst().content;
+	QString content = tsp.process(entireContent).first().content;

 	PreviewGeneratorPlainText plainTextGenerator;
 	result->setText(plainTextGenerator.generatePreviewText(content, config, info.fileName()));
--- a/gui/previewgeneratorpdf.cpp
+++ b/gui/previewgeneratorpdf.cpp
@ -1,18 +1,15 @@
 #include <QMutexLocker>
 #include <QPainter>
-#include <QRegularExpression>
 #include "previewgeneratorpdf.h"

 static QMutex cacheMutex;

 Poppler::Document *PreviewGeneratorPdf::document(QString path)
 {
-	QMutexLocker locker(&cacheMutex);
 	if(documentcache.contains(path))
 	{
 		return documentcache.value(path);
 	}
-	locker.unlock();
 	Poppler::Document *result = Poppler::Document::load(path);
 	if(result == nullptr)
 	{
@ -20,10 +17,7 @@ Poppler::Document *PreviewGeneratorPdf::document(QString path)
 		return nullptr;
 	}
 	result->setRenderHint(Poppler::Document::TextAntialiasing);
-	result->setRenderHint(Poppler::Document::TextHinting);
-	result->setRenderHint(Poppler::Document::TextSlightHinting);
-
-	locker.relock();
+	QMutexLocker locker(&cacheMutex);
 	documentcache.insert(path, result);
 	locker.unlock();
 	return result;
@ -51,12 +45,7 @@ QSharedPointer<PreviewResult> PreviewGeneratorPdf::generate(RenderConfig config,
 	QImage img = pdfPage->renderToImage(config.scaleX, config.scaleY);
 	for(QString &word : config.wordsToHighlight)
 	{
-		QList<QRectF> rects =
-			pdfPage->search(word, Poppler::Page::SearchFlag::IgnoreCase | Poppler::Page::SearchFlag::WholeWords);
-		if(rects.empty())
-		{
-			rects = pdfPage->search(word, Poppler::Page::SearchFlag::IgnoreCase);
-		}
+		QList<QRectF> rects = pdfPage->search(word, Poppler::Page::SearchFlag::IgnoreCase);
 		for(QRectF &rect : rects)
 		{
 			QPainter painter(&img);
--- a/gui/previewgeneratorplaintext.cpp
+++ b/gui/previewgeneratorplaintext.cpp
@ -1,5 +1,4 @@
 #include <QTextStream>
-#include <QRegularExpression>

 #include "previewgeneratorplaintext.h"
 #include "previewresultplaintext.h"
@ -58,7 +57,6 @@ QString PreviewGeneratorPlainText::generatePreviewText(QString content, RenderCo
 		++i;
 	}

-	resulText = resulText.toHtmlEscaped();
 	QString header = "<b>" + fileName + "</b> ";
 	for(QString &word : config.wordsToHighlight)
 	{
@ -76,19 +74,10 @@ QString PreviewGeneratorPlainText::generatePreviewText(QString content, RenderCo
 	return header + resulText.replace("\n", "<br>").mid(0, 1000);
 }

-struct Snippet
-{
-	/* Contains each line number and line of the snippet*/
-	QString snippetText;
-
-	/* How many times a word occurs in the snippetText */
-	QHash<QString, int> wordCountMap;
-};
-
 QString PreviewGeneratorPlainText::generateLineBasedPreviewText(QTextStream &in, RenderConfig config, QString fileName)
 {
-	QVector<Snippet> snippets;
-	const int contextLinesCount = 2;
+	QString resultText;
+	const unsigned int contextLinesCount = 2;
 	LimitQueue<QString> queue(contextLinesCount);
 	QString currentLine;
 	currentLine.reserve(512);
@ -96,73 +85,38 @@ QString PreviewGeneratorPlainText::generateLineBasedPreviewText(QTextStream &in,
 	/* How many lines to read after a line with a match (like grep -A ) */
 	int justReadLinesCount = -1;

-	struct Snippet currentSnippet;
+	auto appendLine = [&resultText](int lineNumber, QString &line)
+	{ resultText.append(QString("<b>%1</b>%2<br>").arg(lineNumber).arg(line)); };

-	auto appendLine = [&currentSnippet, &config](int lineNumber, QString &line)
-	{
-		int foundWordsCount = 0;
-		for(QString &word : config.wordsToHighlight)
-		{
-			QRegularExpression searchRegex("\\b" + QRegularExpression::escape(word) + "\\b");
-			bool containsRegex = line.contains(searchRegex);
-			bool contains = false;
-			if(!containsRegex)
-			{
-				contains = line.contains(word, Qt::CaseInsensitive);
-			}
-			if(containsRegex || contains)
-			{
-				currentSnippet.wordCountMap[word] = currentSnippet.wordCountMap.value(word, 0) + 1;
-				QString replacementString = "<span style=\"background-color: yellow;\">" + word + "</span>";
-				if(containsRegex)
-				{
-					line.replace(searchRegex, replacementString);
-				}
-				else
-				{
-					line.replace(word, replacementString, Qt::CaseInsensitive);
-				}
-				++foundWordsCount;
-			}
-		}
-		currentSnippet.snippetText.append(QString("<b>%1</b>%2<br>").arg(lineNumber).arg(line));
-		return foundWordsCount;
-	};
+	QHash<QString, int> countmap;
+	QString header = "<b>" + fileName + "</b> ";

+	unsigned int snippetsCount = 0;
 	unsigned int lineCount = 0;
-	while(in.readLineInto(&currentLine))
+	while(in.readLineInto(&currentLine) && snippetsCount < MAX_SNIPPETS)
 	{
-		currentLine = currentLine.toHtmlEscaped();
 		++lineCount;
 		bool matched = false;
 		if(justReadLinesCount > 0)
 		{
-
-			int result = appendLine(lineCount, currentLine);
-			if(justReadLinesCount == 1 && result > 0)
-			{
-				justReadLinesCount = contextLinesCount;
-			}
-			else
-			{
-				--justReadLinesCount;
-			}
-
+			appendLine(lineCount, currentLine);
+			--justReadLinesCount;
 			continue;
 		}
 		if(justReadLinesCount == 0)
 		{
-			currentSnippet.snippetText += "---<br>";
+			resultText += "---<br>";
 			justReadLinesCount = -1;
-			snippets.append(currentSnippet);
-			currentSnippet = {};
+			++snippetsCount;
 		}
 		for(QString &word : config.wordsToHighlight)
 		{
 			if(currentLine.contains(word, Qt::CaseInsensitive))
 			{
+				countmap[word] = countmap.value(word, 0) + 1;
 				matched = true;
-				break;
+				currentLine.replace(word, "<span style=\"background-color: yellow;\">" + word + "</span>",
+									Qt::CaseInsensitive);
 			}
 		}
 		if(matched)
@ -171,6 +125,7 @@ QString PreviewGeneratorPlainText::generateLineBasedPreviewText(QTextStream &in,
 			{
 				int queuedLineCount = lineCount - queue.size();
 				QString queuedLine = queue.dequeue();
+
 				appendLine(queuedLineCount, queuedLine);
 			}
 			appendLine(lineCount, currentLine);
@ -182,85 +137,17 @@ QString PreviewGeneratorPlainText::generateLineBasedPreviewText(QTextStream &in,
 		}
 	}

-	if(!currentSnippet.snippetText.isEmpty())
+	for(QString &word : config.wordsToHighlight)
 	{
-		currentSnippet.snippetText += "---<br>";
-		snippets.append(currentSnippet);
+		header += word + ": " + QString::number(countmap[word]) + " ";
 	}
-
-	std::sort(snippets.begin(), snippets.end(),
-			  [](Snippet &a, Snippet &b)
-			  {
-				  int differentWordsA = 0;
-				  int totalWordsA = 0;
-				  int differentWordsB = 0;
-				  int totalWordsB = 0;
-				  for(int count : qAsConst(a.wordCountMap))
-				  {
-					  if(count > 0)
-					  {
-						  ++differentWordsA;
-					  }
-					  totalWordsA += count;
-				  }
-				  for(int count : qAsConst(b.wordCountMap))
-				  {
-					  if(count > 0)
-					  {
-						  ++differentWordsB;
-					  }
-					  totalWordsB += count;
-				  }
-
-				  if(differentWordsA > differentWordsB)
-				  {
-					  return true;
-				  }
-				  if(differentWordsA == differentWordsB)
-				  {
-					  return totalWordsA > totalWordsB;
-				  }
-				  return false;
-			  });
-
-	QString resultText = "";
-
-	unsigned int snippetsCount = 0;
-
-	QString header = "<b>" + fileName + "</b> ";
-
-	QHash<QString, int> totalWordCountMap;
-	bool isTruncated = false;
-	for(Snippet &snippet : snippets)
+	if(snippetsCount == MAX_SNIPPETS)
 	{
-		if(snippetsCount++ < MAX_SNIPPETS)
-		{
-			resultText += snippet.snippetText;
-		}
-		else
-		{
-			isTruncated = true;
-		}
-		for(auto it = snippet.wordCountMap.keyValueBegin(); it != snippet.wordCountMap.keyValueEnd(); it++)
-		{
-			totalWordCountMap[it->first] = totalWordCountMap.value(it->first, 0) + it->second;
-		}
+		header += "(truncated)";
 	}
-	if(!resultText.isEmpty())
-	{
-		if(isTruncated)
-		{
-			header += "(truncated) ";
-		}
-		for(QString &word : config.wordsToHighlight)
-		{
-			header += word + ": " + QString::number(totalWordCountMap[word]) + " ";
-		}
-		header += "<hr>";
+	header += "<hr>";

-		resultText = header + resultText;
-	}
-	return resultText;
+	return header + resultText;
 }

 QSharedPointer<PreviewResult> PreviewGeneratorPlainText::generate(RenderConfig config, QString documentPath,
--- a/gui/previewresultpdf.cpp
+++ b/gui/previewresultpdf.cpp
@ -30,7 +30,7 @@ QByteArray PreviewResultPdf::serialize() const

 QSharedPointer<PreviewResultPdf> PreviewResultPdf::deserialize(QByteArray &ba)
 {
-	QSharedPointer<PreviewResultPdf> result(new PreviewResultPdf());
+	PreviewResultPdf *result = new PreviewResultPdf();
 	PreviewResultType type;

 	QDataStream stream{&ba, QIODevice::ReadOnly};
@ -40,5 +40,5 @@ QSharedPointer<PreviewResultPdf> PreviewResultPdf::deserialize(QByteArray &ba)
 		throw std::runtime_error("Invalid byte array: Not a pdf preview");
 	}
 	stream >> result->documentPath >> result->page >> result->previewImage;
-	return result;
+	return QSharedPointer<PreviewResultPdf>(result);
 }
--- a/gui/previewresultplaintext.cpp
+++ b/gui/previewresultplaintext.cpp
@ -40,8 +40,7 @@ QByteArray PreviewResultPlainText::serialize() const

 QSharedPointer<PreviewResultPlainText> PreviewResultPlainText::deserialize(QByteArray &ba)
 {
-	QSharedPointer<PreviewResultPlainText> result(new PreviewResultPlainText());
-
+	PreviewResultPlainText *result = new PreviewResultPlainText();
 	PreviewResultType type;

 	QDataStream stream{&ba, QIODevice::ReadOnly};
@ -51,5 +50,5 @@ QSharedPointer<PreviewResultPlainText> PreviewResultPlainText::deserialize(QByte
 		throw std::runtime_error("Invalid byte array: Not a pdf preview");
 	}
 	stream >> result->documentPath >> result->page >> result->text;
-	return result;
+	return QSharedPointer<PreviewResultPlainText>(result);
 }
--- a/shared/filesaver.cpp
+++ b/shared/filesaver.cpp
@ -25,22 +25,10 @@ SaveFileResult FileSaver::addFile(QString path)
 	QString absPath = info.absoluteFilePath();

 	auto mtime = info.lastModified().toSecsSinceEpoch();
-
-	bool exists = false;
-	if(this->fileSaverOptions.fillExistingContentless)
-	{
-		exists = this->dbService->fileExistsInDatabase(absPath, mtime, 'c');
-	}
-	else
-	{
-		exists = this->dbService->fileExistsInDatabase(absPath, mtime);
-	}
-
-	if(exists)
+	if(this->dbService->fileExistsInDatabase(absPath, mtime))
 	{
 		return SKIPPED;
 	}
-
 	return saveFile(info);
 }

@ -50,17 +38,18 @@ SaveFileResult FileSaver::updateFile(QString path)
 	return saveFile(info);
 }

-int FileSaver::addFiles(const QVector<QString> paths)
+int FileSaver::addFiles(const QVector<QString> paths, bool keepGoing, bool verbose)
 {
-	return processFiles(paths, std::bind(&FileSaver::addFile, this, std::placeholders::_1));
+	return processFiles(paths, std::bind(&FileSaver::addFile, this, std::placeholders::_1), keepGoing, verbose);
 }

-int FileSaver::updateFiles(const QVector<QString> paths)
+int FileSaver::updateFiles(const QVector<QString> paths, bool keepGoing, bool verbose)
 {
-	return processFiles(paths, std::bind(&FileSaver::updateFile, this, std::placeholders::_1));
+	return processFiles(paths, std::bind(&FileSaver::updateFile, this, std::placeholders::_1), keepGoing, verbose);
 }

-int FileSaver::processFiles(const QVector<QString> paths, std::function<SaveFileResult(QString path)> saverFunc)
+int FileSaver::processFiles(const QVector<QString> paths, std::function<SaveFileResult(QString path)> saverFunc,
+							bool keepGoing, bool verbose)
 {
 	std::atomic<bool> terminate{false};
 	std::atomic<int> processedCount{0};
@ -71,7 +60,7 @@ int FileSaver::processFiles(const QVector<QString> paths, std::function<SaveFile
 								  {
 									  return;
 								  }
-								  if(this->fileSaverOptions.verbose)
+								  if(verbose)
 								  {
 									  Logger::info() << "Processing " << path << Qt::endl;
 								  }
@ -79,7 +68,7 @@ int FileSaver::processFiles(const QVector<QString> paths, std::function<SaveFile
 								  if(result == DBFAIL || result == PROCESSFAIL)
 								  {
 									  Logger::error() << "Failed to process " << path << Qt::endl;
-									  if(!this->fileSaverOptions.keepGoing)
+									  if(!keepGoing)
 									  {
 										  terminate = true;
 									  }
@ -87,7 +76,7 @@ int FileSaver::processFiles(const QVector<QString> paths, std::function<SaveFile
 								  else
 								  {
 									  ++processedCount;
-									  if(this->fileSaverOptions.verbose)
+									  if(verbose)
 									  {
 										  if(result == SKIPPED)
 										  {
@ -131,26 +120,11 @@ SaveFileResult FileSaver::saveFile(const QFileInfo &fileInfo)
 		{
 			if(canonicalPath.startsWith(excludedPath))
 			{
-				if(this->fileSaverOptions.verbose)
-				{
-					Logger::info() << "Skipped due to excluded path";
-				}
 				return SKIPPED;
 			}
 		}

-		bool mustFillContent = this->fileSaverOptions.fillExistingContentless;
-		if(!mustFillContent)
-		{
-			mustFillContent = !this->fileSaverOptions.metadataOnly;
-			if(mustFillContent)
-			{
-				auto filetype = this->dbService->queryFileType(fileInfo.absolutePath());
-				mustFillContent = !filetype.has_value() || filetype.value() == 'c';
-			}
-		}
-
-		if(fileInfo.size() > 0 && mustFillContent)
+		if(fileInfo.size() > 0)
 		{
 			QProcess process;
 			QStringList args;
@ -185,7 +159,7 @@ SaveFileResult FileSaver::saveFile(const QFileInfo &fileInfo)
 			}
 		}
 	}
-	SaveFileResult result = this->dbService->saveFile(fileInfo, pageData, this->fileSaverOptions.metadataOnly);
+	SaveFileResult result = this->dbService->saveFile(fileInfo, pageData);
 	if(result == OK && processorReturnCode == OK_WASEMPTY)
 	{
 		return OK_WASEMPTY;
--- a/shared/filesaver.h
+++ b/shared/filesaver.h
@ -2,7 +2,6 @@
 #define FILESAVER_H
 #include <QSqlDatabase>
 #include <QFileInfo>
-#include "filesaveroptions.h"
 #include "pagedata.h"
 #include "filedata.h"
 #include "sqlitedbservice.h"
@ -12,21 +11,16 @@ class FileSaver
  private:
 	SqliteDbService *dbService;
 	QStringList excludedPaths = Common::excludedPaths();
-	FileSaverOptions fileSaverOptions;

  public:
 	FileSaver(SqliteDbService &dbService);
 	SaveFileResult addFile(QString path);
 	SaveFileResult updateFile(QString path);
 	SaveFileResult saveFile(const QFileInfo &fileInfo);
-	int processFiles(const QVector<QString> paths, std::function<SaveFileResult(QString path)> saverFunc);
-	int addFiles(const QVector<QString> paths);
-	int updateFiles(const QVector<QString> paths);
-
-	void setFileSaverOptions(FileSaverOptions options)
-	{
-		this->fileSaverOptions = options;
-	}
+	int processFiles(const QVector<QString> paths, std::function<SaveFileResult(QString path)> saverFunc,
+					 bool keepGoing, bool verbose);
+	int addFiles(const QVector<QString> paths, bool keepGoing, bool verbose);
+	int updateFiles(const QVector<QString> paths, bool keepGoing, bool verbose);
 };

 #endif // FILESAVER_H
--- a/shared/filesaveroptions.h
+++ b/shared/filesaveroptions.h
@ -1,14 +0,0 @@
-#ifndef FILESAVEROPTIONS_H
-#define FILESAVEROPTIONS_H
-
-class FileSaverOptions
-{
-  public:
-	bool verbose = false;
-	bool keepGoing = false;
-	bool metadataOnly = false;
-	/* Whether those previously explicitly without content should be filled */
-	bool fillExistingContentless = false;
-};
-
-#endif // FILESAVEROPTIONS_H
--- a/shared/filescanworker.cpp
+++ b/shared/filescanworker.cpp
@ -12,7 +12,6 @@ FileScanWorker::FileScanWorker(SqliteDbService &db, ConcurrentQueue<QString> &qu
 void FileScanWorker::run()
 {
 	FileSaver saver{*this->dbService};
-	saver.setFileSaverOptions(this->fileSaverOptions);
 	auto paths = queue->dequeue(batchsize);
 	for(QString &path : paths)
 	{
@ -21,18 +20,11 @@ void FileScanWorker::run()
 		{
 			sfr = saver.addFile(path);
 		}
-		catch(LooqsGeneralException &e)
-		{
-			Logger::error() << e.message << Qt::endl;
-			sfr = PROCESSFAIL;
-		}
-
 		catch(std::exception &e)
 		{
-			Logger::error() << e.what() << Qt::endl;
+			Logger::error() << e.what();
 			sfr = PROCESSFAIL; // well...
 		}
-
 		emit result({path, sfr});
 		if(stopToken->load(std::memory_order_relaxed)) // TODO: relaxed should suffice here, but recheck
 		{
@ -42,8 +34,3 @@ void FileScanWorker::run()
 	}
 	emit finished();
 }
-
-void FileScanWorker::setFileSaverOptions(FileSaverOptions options)
-{
-	this->fileSaverOptions = options;
-}
--- a/shared/filescanworker.h
+++ b/shared/filescanworker.h
@ -15,14 +15,12 @@ class FileScanWorker : public QObject, public QRunnable
  protected:
 	SqliteDbService *dbService;
 	ConcurrentQueue<QString> *queue;
-	FileSaverOptions fileSaverOptions;
 	int batchsize;
 	std::atomic<bool> *stopToken;

  public:
 	FileScanWorker(SqliteDbService &db, ConcurrentQueue<QString> &queue, int batchsize, std::atomic<bool> &stopToken);
 	void run() override;
-	void setFileSaverOptions(FileSaverOptions options);
  signals:
 	void result(FileScanResult);
 	void finished();
--- a/shared/indexer.cpp
+++ b/shared/indexer.cpp
@ -73,6 +73,16 @@ void Indexer::setTargetPaths(QVector<QString> pathsToScan)
 	this->pathsToScan = pathsToScan;
 }

+void Indexer::setVerbose(bool verbose)
+{
+	this->verbose = verbose;
+}
+
+void Indexer::setKeepGoing(bool keepGoing)
+{
+	this->keepGoing = keepGoing;
+}
+
 void Indexer::requestCancellation()
 {
 	this->dirScanner->cancel();
@ -98,7 +108,6 @@ void Indexer::launchWorker(ConcurrentQueue<QString> &queue, int batchsize)
 	FileScanWorker *runnable = new FileScanWorker(*this->db, queue, batchsize, this->workerCancellationToken);
 	connect(runnable, &FileScanWorker::result, this, &Indexer::processFileScanResult);
 	connect(runnable, &FileScanWorker::finished, this, &Indexer::processFinishedWorker);
-	runnable->setFileSaverOptions(this->fileSaverOptions);
 	++this->runningWorkers;
 	QThreadPool::globalInstance()->start(runnable);
 }
@ -111,6 +120,24 @@ void Indexer::dirScanProgress(int current, int total)

 void Indexer::processFileScanResult(FileScanResult result)
 {
+	if(isErrorSaveFileResult(result.second))
+	{
+		this->currentIndexResult.results.append(result);
+		if(!keepGoing)
+		{
+			this->requestCancellation();
+			emit finished();
+			return;
+		}
+	}
+	else
+	{
+		if(verbose)
+		{
+			this->currentIndexResult.results.append(result);
+		}
+	}
+
 	/* TODO: OK_WASEMPTY might need a special list */
 	if(result.second == OK || result.second == OK_WASEMPTY)
 	{
@ -125,32 +152,12 @@ void Indexer::processFileScanResult(FileScanResult result)
 		++this->currentIndexResult.erroredPaths;
 	}

-	if(isErrorSaveFileResult(result.second))
-	{
-		this->currentIndexResult.results.append(result);
-		if(!this->fileSaverOptions.keepGoing)
-		{
-			this->requestCancellation();
-			emit finished();
-			return;
-		}
-	}
-	else
-	{
-		if(this->fileSaverOptions.verbose)
-		{
-			this->currentIndexResult.results.append(result);
-		}
-	}
-
-	QTime currentTime = QTime::currentTime();
-	if(currentScanProcessedCount++ == progressReportThreshold || this->lastProgressReportTime.secsTo(currentTime) >= 10)
+	if(currentScanProcessedCount++ == progressReportThreshold)
 	{
 		emit indexProgress(this->currentIndexResult.total(), this->currentIndexResult.addedPaths,
 						   this->currentIndexResult.skippedPaths, this->currentIndexResult.erroredPaths,
 						   this->dirScanner->pathCount());
 		currentScanProcessedCount = 0;
-		this->lastProgressReportTime = currentTime;
 	}
 }

@ -166,13 +173,3 @@ void Indexer::processFinishedWorker()
 		emit finished();
 	}
 }
-
-void Indexer::setFileSaverOptions(FileSaverOptions options)
-{
-	this->fileSaverOptions = options;
-}
-
-void Indexer::setProgressReportThreshold(int threshold)
-{
-	this->progressReportThreshold = threshold;
-}
--- a/shared/indexer.h
+++ b/shared/indexer.h
@ -52,7 +52,8 @@ class Indexer : public QObject
 {
 	Q_OBJECT
  protected:
-	FileSaverOptions fileSaverOptions;
+	bool verbose = false;
+	bool keepGoing = true;
 	SqliteDbService *db;

 	int progressReportThreshold = 50;
@ -71,18 +72,14 @@ class Indexer : public QObject
 	IndexResult currentIndexResult;
 	void launchWorker(ConcurrentQueue<QString> &queue, int batchsize);

-	QTime lastProgressReportTime = QTime::currentTime();
-
  public:
 	bool isRunning();

 	void beginIndexing();
 	void setIgnorePattern(QStringList ignorePattern);
 	void setTargetPaths(QVector<QString> pathsToScan);
-
-	void setFileSaverOptions(FileSaverOptions options);
-
-	void setProgressReportThreshold(int threshold);
+	void setVerbose(bool verbose);
+	void setKeepGoing(bool keepGoing);

 	void requestCancellation();

--- a/shared/indexsyncer.cpp
+++ b/shared/indexsyncer.cpp
@ -7,16 +7,21 @@ IndexSyncer::IndexSyncer(SqliteDbService &dbService)
 	this->dbService = &dbService;
 }

-void IndexSyncer::setFileSaverOptions(FileSaverOptions options)
-{
-	fileSaverOptions = options;
-}
-
 void IndexSyncer::setDryRun(bool dryRun)
 {
 	this->dryRun = dryRun;
 }

+void IndexSyncer::setVerbose(bool verbose)
+{
+	this->verbose = verbose;
+}
+
+void IndexSyncer::setKeepGoing(bool keepGoing)
+{
+	this->keepGoing = keepGoing;
+}
+
 void IndexSyncer::setRemoveDeletedFromIndex(bool removeDeletedFromIndex)
 {
 	this->removeDeletedFromIndex = removeDeletedFromIndex;
@ -30,7 +35,7 @@ void IndexSyncer::setPattern(QString pattern)
 void IndexSyncer::sync()
 {
 	this->stopToken.store(false, std::memory_order_relaxed);
-
+	FileSaver saver(*this->dbService);
 	QVector<FileData> files;
 	int offset = 0;
 	int limit = 10000;
@ -82,7 +87,7 @@ void IndexSyncer::sync()
 						if(!this->dbService->deleteFile(fileData.absPath))
 						{
 							emit error("Error: Failed to delete " + fileData.absPath + " from the index");
-							if(!this->fileSaverOptions.keepGoing)
+							if(!this->keepGoing)
 							{
 								emit finished(totalUpdatesFilesCount, totalDeletedFilesCount, totalErroredFilesCount);
 								return;
@ -99,15 +104,13 @@ void IndexSyncer::sync()
 			}
 		}

-		FileSaver saver(*this->dbService);
-		saver.setFileSaverOptions(this->fileSaverOptions);
-		unsigned int updatedFilesCount = saver.updateFiles(filePathsToUpdate);
+		unsigned int updatedFilesCount = saver.updateFiles(filePathsToUpdate, keepGoing, verbose);
 		unsigned int shouldHaveUpdatedCount = static_cast<unsigned int>(filePathsToUpdate.size());
 		if(updatedFilesCount != shouldHaveUpdatedCount)
 		{

 			totalErroredFilesCount += (shouldHaveUpdatedCount - updatedFilesCount);
-			if(!this->fileSaverOptions.keepGoing)
+			if(!keepGoing)
 			{
 				QString errorMsg = QString("Failed to update all files selected for updating in this batch. Updated") +
 								   updatedFilesCount + "out of" + shouldHaveUpdatedCount + "selected for updating";
--- a/shared/indexsyncer.h
+++ b/shared/indexsyncer.h
@ -1,15 +1,16 @@
 #ifndef INDEXSYNCER_H
 #define INDEXSYNCER_H
 #include "sqlitedbservice.h"
-#include "filesaveroptions.h"
+
 class IndexSyncer : public QObject
 {
 	Q_OBJECT
  private:
 	SqliteDbService *dbService = nullptr;
-	FileSaverOptions fileSaverOptions;
+	bool keepGoing = true;
 	bool removeDeletedFromIndex = true;
 	bool dryRun = false;
+	bool verbose = false;
 	QString pattern;

 	std::atomic<bool> stopToken{false};
@ -17,12 +18,12 @@ class IndexSyncer : public QObject
  public:
 	IndexSyncer(SqliteDbService &dbService);

-	void setFileSaverOptions(FileSaverOptions options);
-
  public slots:
 	void sync();
 	void cancel();
 	void setDryRun(bool dryRun);
+	void setVerbose(bool verbose);
+	void setKeepGoing(bool keepGoing);
 	void setRemoveDeletedFromIndex(bool removeDeletedFromIndex);
 	void setPattern(QString pattern);

--- a/shared/limitqueue.h
+++ b/shared/limitqueue.h
@ -6,11 +6,11 @@ template <class T> class LimitQueue
 {
  protected:
 	QQueue<T> queue;
-	int limit = 0;
+	unsigned int limit = 0;

  public:
 	LimitQueue();
-	LimitQueue(int limit)
+	LimitQueue(unsigned int limit)
 	{
 		this->limit = limit;
 	}
@ -34,7 +34,7 @@ template <class T> class LimitQueue
 		return queue.dequeue();
 	}

-	void setLimit(int limit)
+	void setLimit(unsigned int limit)
 	{
 		this->limit = limit;
 	}
--- a/shared/looqsquery.cpp
+++ b/shared/looqsquery.cpp
@ -7,7 +7,6 @@
 #include <optional>
 #include <algorithm>
 #include "looqsquery.h"
-#include "looqsgeneralexception.h"

 const QVector<Token> &LooqsQuery::getTokens() const
 {
@ -181,9 +180,8 @@ LooqsQuery LooqsQuery::build(QString expression, TokenType loneWordsTokenType, b

 	QStringList loneWords;
 	LooqsQuery result;
-	static QRegularExpression rx(
-		"((?<filtername>(\\.|\\w)+):(?<args>\\((?<innerargs>[^\\)]+)\\)|([^\\s])+)|(?<boolean>AND|OR)"
-		"|(?<negation>!)|(?<bracket>\\(|\\))|(?<loneword>[^\\s]+))");
+	QRegularExpression rx("((?<filtername>(\\.|\\w)+):(?<args>\\((?<innerargs>[^\\)]+)\\)|([^\\s])+)|(?<boolean>AND|OR)"
+						  "|(?<negation>!)|(?<bracket>\\(|\\))|(?<loneword>[^\\s]+))");
 	QRegularExpressionMatchIterator i = rx.globalMatch(expression);
 	auto previousWasBool = [&result] { return !result.tokens.empty() && ((result.tokens.last().type & BOOL) == BOOL); };
 	auto previousWas = [&result](TokenType t) { return !result.tokens.empty() && (result.tokens.last().type == t); };
@ -285,10 +283,6 @@ LooqsQuery LooqsQuery::build(QString expression, TokenType loneWordsTokenType, b
 			{
 				tokenType = FILTER_CONTENT_PAGE;
 			}
-			else if(filtername == "t" || filtername == "tag")
-			{
-				tokenType = FILTER_TAG_ASSIGNED;
-			}
 			// TODO: given this is not really a "filter", this feels slightly misplaced here
 			else if(filtername == "sort")
 			{
--- a/shared/looqsquery.h
+++ b/shared/looqsquery.h
@ -2,6 +2,7 @@
 #define LOOQSQUERY_H
 #include <QString>
 #include <QVector>
+#include "looqsgeneralexception.h"
 #include "token.h"
 /* Fields that can be queried or sorted */
 enum QueryField
@ -45,7 +46,7 @@ class LooqsQuery
 	void addToken(Token t);
 	void updateTokensMask()
 	{
-		for(const Token &t : qAsConst(tokens))
+		for(const Token &t : tokens)
 		{
 			this->tokensMask |= t.type;
 		}
@ -91,6 +92,14 @@ class LooqsQuery
 		this->sortConditions = sortConditions;
 		updateTokensMask();
 	}
+
+	LooqsQuery(const LooqsQuery &o)
+	{
+		this->tokens = o.tokens;
+		this->sortConditions = o.sortConditions;
+		this->tokensMask = o.tokensMask;
+		this->limit = o.limit;
+	}
 };

 #endif // LOOQSQUERY_H
--- a/shared/migrations/4.sql
+++ b/shared/migrations/4.sql
@ -1,3 +0,0 @@
-CREATE VIRTUAL TABLE fts_trigram USING fts5(content, content='',tokenize="trigram");
-ALTER TABLE content ADD COLUMN fts_trigramid integer;
-CREATE INDEX content_fts_trigramid ON content (fts_trigramid);
--- a/shared/migrations/5.sql
+++ b/shared/migrations/5.sql
@ -1,6 +0,0 @@
-CREATE TABLE tag(id integer PRIMARY KEY, name varchar(128) UNIQUE);
-CREATE TABLE filetag(fileid integer, tagid integer);
-CREATE INDEX filetag_fileid ON filetag(fileid);
-CREATE INDEX tag_id ON tag(id);
-CREATE INDEX file_path ON file ( path );
-UPDATE file SET filetype='c' WHERE filetype='f';
--- a/shared/migrations/migrations.qrc
+++ b/shared/migrations/migrations.qrc
@ -3,7 +3,5 @@
        <file>1.sql</file>
        <file>2.sql</file>
        <file>3.sql</file>
-        <file>4.sql</file>
-        <file>5.sql</file>
    </qresource>
 </RCC>
--- a/shared/nothingprocessor.h
+++ b/shared/nothingprocessor.h
@ -10,7 +10,7 @@ class NothingProcessor : public Processor
 	NothingProcessor();

  public:
-	QVector<PageData> process(const QByteArray & /*data*/) const override
+	QVector<PageData> process(const QByteArray &data) const override
 	{
 		return {};
 	}
--- a/shared/odtprocessor.cpp
+++ b/shared/odtprocessor.cpp
@ -3,7 +3,7 @@
 #include "odtprocessor.h"
 #include "tagstripperprocessor.h"

-QVector<PageData> OdtProcessor::process(const QByteArray & /*data*/) const
+QVector<PageData> OdtProcessor::process(const QByteArray &data) const
 {
 	throw LooqsGeneralException("Not implemented yet");
 }
--- a/shared/paralleldirscanner.cpp
+++ b/shared/paralleldirscanner.cpp
@ -1,3 +1,5 @@
+#include "paralleldirscanner.h"
+
 #include <QRunnable>
 #include <QMutex>
 #include <QDirIterator>
@ -5,7 +7,7 @@
 #include <QThreadPool>
 #include <functional>
 #include "dirscanworker.h"
-#include "paralleldirscanner.h"
+#include "logger.h"

 ParallelDirScanner::ParallelDirScanner()
 {
--- a/shared/shared.pro
+++ b/shared/shared.pro
@ -60,7 +60,6 @@ SOURCES += sqlitesearch.cpp \
    processor.cpp \
    sandboxedprocessor.cpp \
    sqlitedbservice.cpp \
-    tagmanager.cpp \
    tagstripperprocessor.cpp \
    utils.cpp \
    ../submodules/exile.h/exile.c \
@ -75,7 +74,6 @@ HEADERS += sqlitesearch.h \
    encodingdetector.h \
    filedata.h \
    filesaver.h \
-    filesaveroptions.h \
    filescanworker.h \
    indexer.h \
    indexsyncer.h \
@ -94,7 +92,6 @@ HEADERS += sqlitesearch.h \
    savefileresult.h \
    searchresult.h \
    sqlitedbservice.h \
-    tagmanager.h \
    tagstripperprocessor.h \
    token.h \
    common.h \
--- a/shared/sqlitedbservice.cpp
+++ b/shared/sqlitedbservice.cpp
@ -2,10 +2,25 @@
 #include <QFileInfo>
 #include <QDateTime>
 #include <QSqlError>
-#include "looqsgeneralexception.h"
 #include "sqlitedbservice.h"
 #include "filedata.h"
 #include "logger.h"
+bool SqliteDbService::fileExistsInDatabase(QString path, qint64 mtime)
+{
+	auto query = QSqlQuery(dbFactory->forCurrentThread());
+	query.prepare("SELECT 1 FROM file WHERE path = ? and mtime = ?");
+	query.addBindValue(path);
+	query.addBindValue(mtime);
+	if(!query.exec())
+	{
+		throw LooqsGeneralException("Error while trying to query for file existance: " + query.lastError().text());
+	}
+	if(!query.next())
+	{
+		return false;
+	}
+	return query.value(0).toBool();
+}

 QVector<SearchResult> SqliteDbService::search(const LooqsQuery &query)
 {
@ -14,29 +29,20 @@ QVector<SearchResult> SqliteDbService::search(const LooqsQuery &query)
 	return searcher.search(query);
 }

-std::optional<QChar> SqliteDbService::queryFileType(QString absPath)
-{
-	auto query = exec("SELECT filetype FROM file WHERE path = ?", {absPath});
-	if(!query.next())
-	{
-		return {};
-	}
-	return query.value(0).toChar();
-}
-
 bool SqliteDbService::fileExistsInDatabase(QString path)
 {
-	return execBool("SELECT 1 FROM file WHERE path = ?", {path});
-}
-
-bool SqliteDbService::fileExistsInDatabase(QString path, qint64 mtime)
-{
-	return execBool("SELECT 1 FROM file WHERE path = ? AND mtime = ?", {path, mtime});
-}
-
-bool SqliteDbService::fileExistsInDatabase(QString path, qint64 mtime, QChar fileType)
-{
-	return execBool("SELECT 1 FROM file WHERE path = ? AND mtime = ? AND filetype = ?", {path, mtime, fileType});
+	auto query = QSqlQuery(dbFactory->forCurrentThread());
+	query.prepare("SELECT 1 FROM file WHERE path = ?");
+	query.addBindValue(path);
+	if(!query.exec())
+	{
+		throw LooqsGeneralException("Error while trying to query for file existance: " + query.lastError().text());
+	}
+	if(!query.next())
+	{
+		return false;
+	}
+	return query.value(0).toBool();
 }

 SqliteDbService::SqliteDbService(DatabaseFactory &dbFactory)
@ -104,189 +110,11 @@ unsigned int SqliteDbService::getFiles(QVector<FileData> &results, QString wildC
 	return processedRows;
 }

-QVector<QString> SqliteDbService::getTags()
-{
-	QVector<QString> result;
-	auto query = QSqlQuery(dbFactory->forCurrentThread());
-	query.prepare("SELECT name FROM tag ORDER by name ASC");
-	query.setForwardOnly(true);
-	if(!query.exec())
-	{
-		throw LooqsGeneralException("Error while trying to retrieve tags from database: " + query.lastError().text());
-	}
-	while(query.next())
-	{
-		QString tagname = query.value(0).toString();
-		result.append(tagname);
-	}
-	return result;
-}
-
-QVector<QString> SqliteDbService::getTagsForPath(QString path)
-{
-	QVector<QString> result;
-	auto query = QSqlQuery(dbFactory->forCurrentThread());
-	query.prepare("SELECT name FROM tag INNER JOIN filetag ON tag.id = filetag.tagid INNER JOIN file ON filetag.fileid "
-				  "= file.id WHERE file.path = ? ORDER BY name ASC");
-	query.addBindValue(path);
-	query.setForwardOnly(true);
-	if(!query.exec())
-	{
-		throw LooqsGeneralException("Error while trying to retrieve tags from database: " + query.lastError().text());
-	}
-	while(query.next())
-	{
-		QString tagname = query.value(0).toString();
-		result.append(tagname);
-	}
-	return result;
-}
-
-QVector<QString> SqliteDbService::getPathsForTag(QString tag)
-{
-	QVector<QString> result;
-	auto query = QSqlQuery(dbFactory->forCurrentThread());
-	query.prepare(
-		"SELECT file.path FROM tag INNER JOIN filetag ON tag.id = filetag.tagid INNER JOIN file ON filetag.fileid "
-		"= file.id WHERE tag.name = ?");
-	query.addBindValue(tag.toLower());
-	query.setForwardOnly(true);
-	if(!query.exec())
-	{
-		throw LooqsGeneralException("Error while trying to retrieve paths from database: " + query.lastError().text());
-	}
-	while(query.next())
-	{
-		QString path = query.value(0).toString();
-		result.append(path);
-	}
-	return result;
-}
-
-bool SqliteDbService::setTags(QString path, const QSet<QString> &tags)
-{
-	QSqlDatabase db = dbFactory->forCurrentThread();
-	if(!db.transaction())
-	{
-		Logger::error() << "Failed to open transaction for " << path << " : " << db.lastError() << Qt::endl;
-		return false;
-	}
-
-	QSqlQuery deletionQuery = QSqlQuery(db);
-	deletionQuery.prepare("DELETE FROM filetag WHERE fileid = (SELECT id FROM file WHERE path = ?)");
-	deletionQuery.addBindValue(path);
-	if(!deletionQuery.exec())
-	{
-		db.rollback();
-		Logger::error() << "Failed to delete existing tags " << deletionQuery.lastError() << Qt::endl;
-		return false;
-	}
-
-	for(const QString &tag : tags)
-	{
-		QSqlQuery tagQuery = QSqlQuery(db);
-		tagQuery.prepare("INSERT OR IGNORE INTO tag (name) VALUES(?)");
-		tagQuery.addBindValue(tag.toLower());
-		if(!tagQuery.exec())
-		{
-			db.rollback();
-			Logger::error() << "Failed to insert tag " << tagQuery.lastError() << Qt::endl;
-			return false;
-		}
-		QSqlQuery fileTagQuery(db);
-		fileTagQuery.prepare(
-			"INSERT INTO filetag(fileid, tagid) VALUES((SELECT id FROM file WHERE path = ?), (SELECT id "
-			"FROM tag WHERE name = ?))");
-		fileTagQuery.bindValue(0, path);
-		fileTagQuery.bindValue(1, tag);
-		if(!fileTagQuery.exec())
-		{
-			db.rollback();
-			Logger::error() << "Failed to assign tag to file" << Qt::endl;
-			return false;
-		}
-	}
-	if(!db.commit())
-	{
-		db.rollback();
-		Logger::error() << "Failed to commit transaction when saving tags" << Qt::endl;
-		return false;
-	}
-	return true;
-}
-
-bool SqliteDbService::insertToFTS(bool useTrigrams, QSqlDatabase &db, int fileid, QVector<PageData> &pageData)
-{
-	QString ftsInsertStatement;
-	QString contentInsertStatement;
-	if(useTrigrams)
-	{
-		ftsInsertStatement = "INSERT INTO fts_trigram(content) VALUES(?)";
-		contentInsertStatement = "INSERT INTO content(fileid, page, fts_trigramid) VALUES(?, ?, last_insert_rowid())";
-	}
-	else
-	{
-		ftsInsertStatement = "INSERT INTO fts(content) VALUES(?)";
-		contentInsertStatement = "INSERT INTO content(fileid, page, ftsid) VALUES(?, ?, last_insert_rowid())";
-	}
-
-	for(const PageData &data : pageData)
-	{
-		QSqlQuery ftsQuery(db);
-		ftsQuery.prepare(ftsInsertStatement);
-		ftsQuery.addBindValue(data.content);
-		if(!ftsQuery.exec())
-		{
-			Logger::error() << "Failed fts insertion " << ftsQuery.lastError() << Qt::endl;
-			return false;
-		}
-		QSqlQuery contentQuery(db);
-		contentQuery.prepare(contentInsertStatement);
-		contentQuery.addBindValue(fileid);
-		contentQuery.addBindValue(data.pagenumber);
-		if(!contentQuery.exec())
-		{
-			Logger::error() << "Failed content insertion " << contentQuery.lastError() << Qt::endl;
-			return false;
-		}
-	}
-	return true;
-}
-
-QSqlQuery SqliteDbService::exec(QString querystr, std::initializer_list<QVariant> args)
-{
-	auto query = QSqlQuery(dbFactory->forCurrentThread());
-	query.prepare(querystr);
-	for(const QVariant &v : args)
-	{
-		query.addBindValue(v);
-	}
-	if(!query.exec())
-	{
-		throw LooqsGeneralException("Error while exec(): " + query.lastError().text() + " for query: " + querystr);
-	}
-	return query;
-}
-
-bool SqliteDbService::execBool(QString querystr, std::initializer_list<QVariant> args)
-{
-	auto query = exec(querystr, args);
-	if(!query.next())
-	{
-		return false;
-	}
-	return query.value(0).toBool();
-}
-
-SaveFileResult SqliteDbService::saveFile(QFileInfo fileInfo, QVector<PageData> &pageData, bool pathsOnly)
+SaveFileResult SqliteDbService::saveFile(QFileInfo fileInfo, QVector<PageData> &pageData)
 {
 	QString absPath = fileInfo.absoluteFilePath();
 	auto mtime = fileInfo.lastModified().toSecsSinceEpoch();
-	QChar fileType = fileInfo.isDir() ? 'd' : 'c';
-	if(pathsOnly)
-	{
-		fileType = 'f';
-	}
+	QChar fileType = fileInfo.isDir() ? 'd' : 'f';

 	QSqlDatabase db = dbFactory->forCurrentThread();
 	QSqlQuery delQuery(db);
@ -320,19 +148,21 @@ SaveFileResult SqliteDbService::saveFile(QFileInfo fileInfo, QVector<PageData> &
 		return DBFAIL;
 	}

-	if(!pathsOnly)
+	int lastid = inserterQuery.lastInsertId().toInt();
+	for(const PageData &data : pageData)
 	{
-		int lastid = inserterQuery.lastInsertId().toInt();
-		if(!insertToFTS(false, db, lastid, pageData))
+		QSqlQuery ftsQuery(db);
+		ftsQuery.prepare("INSERT INTO fts(content) VALUES(?)");
+		ftsQuery.addBindValue(data.content);
+		ftsQuery.exec();
+		QSqlQuery contentQuery(db);
+		contentQuery.prepare("INSERT INTO content(fileid, page, ftsid) VALUES(?, ?, last_insert_rowid())");
+		contentQuery.addBindValue(lastid);
+		contentQuery.addBindValue(data.pagenumber);
+		if(!contentQuery.exec())
 		{
 			db.rollback();
-			Logger::error() << "Failed to insert data to FTS index " << Qt::endl;
-			return DBFAIL;
-		}
-		if(!insertToFTS(true, db, lastid, pageData))
-		{
-			db.rollback();
-			Logger::error() << "Failed to insert data to FTS index " << Qt::endl;
+			Logger::error() << "Failed content insertion " << contentQuery.lastError() << Qt::endl;
 			return DBFAIL;
 		}
 	}
@ -345,123 +175,3 @@ SaveFileResult SqliteDbService::saveFile(QFileInfo fileInfo, QVector<PageData> &
 	}
 	return OK;
 }
-
-bool SqliteDbService::addTag(QString tag, QString path)
-{
-	QVector<QString> paths;
-	paths.append(path);
-	return addTag(tag, paths);
-}
-
-bool SqliteDbService::addTag(QString tag, const QVector<QString> &paths)
-{
-	QSqlDatabase db = dbFactory->forCurrentThread();
-	QSqlQuery tagQuery(db);
-	QSqlQuery fileTagQuery(db);
-
-	tag = tag.toLower();
-
-	tagQuery.prepare("INSERT OR IGNORE INTO tag (name) VALUES(?)");
-	tagQuery.addBindValue(tag);
-
-	fileTagQuery.prepare("INSERT INTO filetag(fileid, tagid) VALUES((SELECT id FROM file WHERE path = ?), (SELECT id "
-						 "FROM tag WHERE name = ?))");
-	fileTagQuery.bindValue(1, tag);
-	if(!db.transaction())
-	{
-		Logger::error() << "Failed to open transaction to add paths for tag " << tag << " : " << db.lastError()
-						<< Qt::endl;
-		return false;
-	}
-	if(!tagQuery.exec())
-	{
-		db.rollback();
-		Logger::error() << "Failed INSERT query" << tagQuery.lastError() << Qt::endl;
-		return false;
-	}
-
-	for(const QString &path : paths)
-	{
-		fileTagQuery.bindValue(0, path);
-		if(!fileTagQuery.exec())
-		{
-			db.rollback();
-			Logger::error() << "Failed to add paths to tag" << Qt::endl;
-			return false;
-		}
-	}
-
-	if(!db.commit())
-	{
-		db.rollback();
-		Logger::error() << "Failed to commit tag insertion transaction" << db.lastError() << Qt::endl;
-		return false;
-	}
-
-	return true;
-}
-
-bool SqliteDbService::removePathsForTag(QString tag, const QVector<QString> &paths)
-{
-	QSqlDatabase db = dbFactory->forCurrentThread();
-	QSqlQuery tagQuery(db);
-	QSqlQuery fileTagQuery(db);
-
-	tag = tag.toLower();
-
-	fileTagQuery.prepare(
-		"DELETE FROM filetag WHERE fileid = (SELECT id FROM file WHERE path = ?) AND tagid = (SELECT id "
-		"FROM tag WHERE name = ?)");
-
-	fileTagQuery.bindValue(1, tag);
-	for(const QString &path : paths)
-	{
-		fileTagQuery.bindValue(0, path);
-		if(!fileTagQuery.exec())
-		{
-			Logger::error() << "An error occured while trying to remove paths from tag assignment" << Qt::endl;
-			return false;
-		}
-	}
-	return true;
-}
-
-bool SqliteDbService::deleteTag(QString tag)
-{
-	QSqlDatabase db = dbFactory->forCurrentThread();
-	if(!db.transaction())
-	{
-		Logger::error() << "Failed to open transaction while trying to delete tag " << tag << " : " << db.lastError()
-						<< Qt::endl;
-		return false;
-	}
-
-	tag = tag.toLower();
-	QSqlQuery assignmentDeleteQuery(db);
-	assignmentDeleteQuery.prepare("DELETE FROM filetag WHERE tagid = (SELECT id FROM tag WHERE name = ?)");
-	assignmentDeleteQuery.addBindValue(tag);
-	if(!assignmentDeleteQuery.exec())
-	{
-		db.rollback();
-		Logger::error() << "Error while trying to delete tag: " << db.lastError() << Qt::endl;
-		return false;
-	}
-
-	QSqlQuery deleteTagQuery(db);
-	deleteTagQuery.prepare("DELETE FROM tag WHERE name = ?");
-	deleteTagQuery.addBindValue(tag);
-	if(!deleteTagQuery.exec())
-	{
-		db.rollback();
-		Logger::error() << "Error while trying to delete tag: " << db.lastError() << Qt::endl;
-		return false;
-	}
-
-	if(!db.commit())
-	{
-		db.rollback();
-		Logger::error() << "Error while trying to delete tag: " << db.lastError() << Qt::endl;
-		return false;
-	}
-	return true;
-}
--- a/shared/sqlitedbservice.h
+++ b/shared/sqlitedbservice.h
@ -1,8 +1,6 @@
 #ifndef SQLITEDBSERVICE_H
 #define SQLITEDBSERVICE_H
 #include <QFileInfo>
-#include <optional>
-
 #include "databasefactory.h"
 #include "utils.h"
 #include "pagedata.h"
@ -15,33 +13,15 @@ class SqliteDbService
 {
  private:
 	DatabaseFactory *dbFactory = nullptr;
-	bool insertToFTS(bool useTrigrams, QSqlDatabase &db, int fileid, QVector<PageData> &pageData);
-
-	QSqlQuery exec(QString query, std::initializer_list<QVariant> args);
-	bool execBool(QString querystr, std::initializer_list<QVariant> args);

  public:
 	SqliteDbService(DatabaseFactory &dbFactory);
-	SaveFileResult saveFile(QFileInfo fileInfo, QVector<PageData> &pageData, bool pathsOnly);
-
+	SaveFileResult saveFile(QFileInfo fileInfo, QVector<PageData> &pageData);
+	unsigned int getFiles(QVector<FileData> &results, QString wildCardPattern, int offset, int limit);
 	bool deleteFile(QString path);
 	bool fileExistsInDatabase(QString path);
 	bool fileExistsInDatabase(QString path, qint64 mtime);
-	bool fileExistsInDatabase(QString path, qint64 mtime, QChar filetype);
-	unsigned int getFiles(QVector<FileData> &results, QString wildCardPattern, int offset, int limit);
-
-	bool addTag(QString tag, QString path);
-	bool addTag(QString tag, const QVector<QString> &paths);
-	QVector<QString> getTags();
-	QVector<QString> getTagsForPath(QString path);
-	QVector<QString> getPathsForTag(QString path);
-	bool setTags(QString path, const QSet<QString> &tags);
-	bool removePathsForTag(QString tag, const QVector<QString> &paths);
-	bool deleteTag(QString tag);
-
 	QVector<SearchResult> search(const LooqsQuery &query);
-
-	std::optional<QChar> queryFileType(QString absPath);
 };

 #endif // SQLITEDBSERVICE_H
--- a/shared/sqlitesearch.cpp
+++ b/shared/sqlitesearch.cpp
@ -69,7 +69,7 @@ QString SqliteSearch::createSortSql(const QVector<SortCondition> sortConditions)
 QString SqliteSearch::escapeFtsArgument(QString ftsArg)
 {
 	QString result;
-	static QRegularExpression extractor(R"#("([^"]*)"|([^\s]+))#");
+	QRegularExpression extractor(R"#("([^"]*)"|([^\s]+))#");
 	QRegularExpressionMatchIterator i = extractor.globalMatch(ftsArg);
 	while(i.hasNext())
 	{
@ -82,10 +82,11 @@ QString SqliteSearch::escapeFtsArgument(QString ftsArg)
 			{
 				value = value.mid(0, value.size() - 1);
 			}
-			result += "\"" + value + "\"* ";
+			result += "\"" + value + "\"*";
 		}
 		else
 		{
+			value = "\"\"" + value + "\"\"";
 			result += "\"" + value + "\" ";
 		}
 	}
@ -141,12 +142,9 @@ QPair<QString, QVector<QString>> SqliteSearch::createSql(const Token &token)
 	}
 	if(token.type == FILTER_CONTENT_CONTAINS)
 	{
-		return {" fts MATCH ? ", {escapeFtsArgument(value)}};
-	}
-	if(token.type == FILTER_TAG_ASSIGNED)
-	{
-		return {" file.id IN (SELECT fileid FROM filetag WHERE tagid = (SELECT id FROM tag WHERE name = ?)) ",
-				{value.toLower()}};
+		return {" content.id IN (SELECT fts.ROWID FROM fts WHERE fts.content MATCH ? ORDER BY "
+				"rank) ",
+				{escapeFtsArgument(value)}};
 	}
 	throw LooqsGeneralException("Unknown token passed (should not happen)");
 }
@ -154,6 +152,7 @@ QPair<QString, QVector<QString>> SqliteSearch::createSql(const Token &token)
 QSqlQuery SqliteSearch::makeSqlQuery(const LooqsQuery &query)
 {
 	QString whereSql;
+	QString joinSql;
 	QVector<QString> bindValues;
 	bool isContentSearch = (query.getTokensMask() & FILTER_CONTENT) == FILTER_CONTENT;
 	if(query.getTokens().isEmpty())
@ -161,17 +160,30 @@ QSqlQuery SqliteSearch::makeSqlQuery(const LooqsQuery &query)
 		throw LooqsGeneralException("Nothing to search for supplied");
 	}

+	bool ftsAlreadyJoined = false;
 	auto tokens = query.getTokens();
 	for(const Token &token : tokens)
 	{
-		auto sql = createSql(token);
-		whereSql += sql.first;
-		bindValues.append(sql.second);
+		if(token.type == FILTER_CONTENT_CONTAINS)
+		{
+			if(!ftsAlreadyJoined)
+			{
+				joinSql += " INNER JOIN fts ON content.ftsid = fts.ROWID ";
+				ftsAlreadyJoined = true;
+			}
+			whereSql += " fts.content MATCH ? ";
+			bindValues.append(escapeFtsArgument(token.value));
+		}
+		else
+		{
+			auto sql = createSql(token);
+			whereSql += sql.first;
+			bindValues.append(sql.second);
+		}
 	}

 	QString prepSql;
 	QString sortSql = createSortSql(query.getSortConditions());
-	int bindIterations = 1;
 	if(isContentSearch)
 	{
 		if(sortSql.isEmpty())
@ -179,24 +191,12 @@ QSqlQuery SqliteSearch::makeSqlQuery(const LooqsQuery &query)
 			if(std::find_if(tokens.begin(), tokens.end(),
 							[](const Token &t) -> bool { return t.type == FILTER_CONTENT_CONTAINS; }) != tokens.end())
 			{
-				sortSql = "ORDER BY prio, rank";
+				sortSql = "ORDER BY rank";
 			}
 		}
-		QString whereSqlTrigram = whereSql;
-		whereSqlTrigram.replace("fts MATCH", "fts_trigram MATCH"); // A bit dirty...
-		prepSql = "SELECT DISTINCT path, page, mtime, size, filetype FROM ("
-				  "SELECT file.path AS path,  content.page AS page, file.mtime AS mtime, file.size AS size, "
-				  "file.filetype AS filetype, 0 AS prio, fts.rank AS rank FROM file INNER JOIN content ON file.id = "
-				  "content.fileid "
-				  "INNER JOIN fts ON content.ftsid = fts.ROWID WHERE 1=1 AND " +
-				  whereSql +
-				  "UNION ALL SELECT file.path AS path,  content.page AS page, file.mtime AS mtime, file.size AS size, "
-				  "file.filetype AS filetype, 1 as prio, fts_trigram.rank AS rank FROM file INNER JOIN content ON "
-				  "file.id = "
-				  "content.fileid " +
-				  "INNER JOIN fts_trigram ON content.fts_trigramid = fts_trigram.ROWID WHERE 1=1 AND " +
-				  whereSqlTrigram + " ) " + sortSql;
-		++bindIterations;
+		prepSql = "SELECT file.path AS path,  content.page AS page, file.mtime AS mtime, file.size AS size, "
+				  "file.filetype AS filetype FROM file INNER JOIN content ON file.id = content.fileid " +
+				  joinSql + " WHERE 1=1 AND " + whereSql + " " + sortSql;
 	}
 	else
 	{
@ -216,14 +216,11 @@ QSqlQuery SqliteSearch::makeSqlQuery(const LooqsQuery &query)

 	QSqlQuery dbquery(*db);
 	dbquery.prepare(prepSql);
-	for(int i = 0; i < bindIterations; i++)
+	for(const QString &value : bindValues)
 	{
-		for(const QString &value : bindValues)
+		if(value != "")
 		{
-			if(value != "")
-			{
-				dbquery.addBindValue(value);
-			}
+			dbquery.addBindValue(value);
 		}
 	}
 	return dbquery;
--- a/shared/tagmanager.cpp
+++ b/shared/tagmanager.cpp
@ -1,66 +0,0 @@
-#include "tagmanager.h"
-
-TagManager::TagManager(SqliteDbService &dbService)
-{
-	this->dbService = &dbService;
-}
-
-bool TagManager::addTagsToPath(QString path, const QSet<QString> &tags)
-{
-	QVector<QString> currentTags = this->dbService->getTagsForPath(path);
-	for(const QString &tag : tags)
-	{
-		currentTags.append(tag.toLower());
-	}
-
-	QSet<QString> newTags{currentTags.begin(), currentTags.end()};
-	return this->dbService->setTags(path, newTags);
-}
-
-bool TagManager::removeTagsForPath(QString path, const QSet<QString> &tags)
-{
-	QVector<QString> currentTags = this->dbService->getTagsForPath(path);
-	for(const QString &tag : tags)
-	{
-		currentTags.removeAll(tag);
-	}
-	QSet<QString> newTags{currentTags.begin(), currentTags.end()};
-	return this->dbService->setTags(path, newTags);
-}
-
-bool TagManager::removePathsForTag(QString tag, const QVector<QString> &paths)
-{
-	return this->dbService->removePathsForTag(tag, paths);
-}
-
-bool TagManager::deleteTag(QString tag)
-{
-	return this->dbService->deleteTag(tag);
-}
-
-QVector<QString> TagManager::getTags(QString path)
-{
-	return this->dbService->getTagsForPath(path);
-}
-
-QVector<QString> TagManager::getTags()
-{
-	return this->dbService->getTags();
-}
-
-QVector<QString> TagManager::getPaths(QString tag)
-{
-	return this->dbService->getPathsForTag(tag);
-}
-
-bool TagManager::addTagsToPath(QString path, QString tagstring, QChar delim)
-{
-	auto splitted = tagstring.split(delim);
-
-	return addTagsToPath(path, QSet<QString>{splitted.begin(), splitted.end()});
-}
-
-bool TagManager::addPathsToTag(QString tag, const QVector<QString> &paths)
-{
-	return this->dbService->addTag(tag, paths);
-}
--- a/shared/tagmanager.h
+++ b/shared/tagmanager.h
@ -1,28 +0,0 @@
-#ifndef TAGMANAGER_H
-#define TAGMANAGER_H
-#include "sqlitedbservice.h"
-
-class TagManager
-{
-  private:
-	SqliteDbService *dbService = nullptr;
-	bool ensurePathOkay(QString inpath);
-
-  public:
-	TagManager(SqliteDbService &dbService);
-
-	bool addTagsToPath(QString path, const QSet<QString> &tags);
-	bool addTagsToPath(QString path, QString tagstring, QChar delim);
-
-	bool addPathsToTag(QString tag, const QVector<QString> &paths);
-	bool removeTagsForPath(QString path, const QSet<QString> &tags);
-
-	bool removePathsForTag(QString tag, const QVector<QString> &paths);
-	bool deleteTag(QString tag);
-
-	QVector<QString> getTags(QString path);
-	QVector<QString> getTags();
-	QVector<QString> getPaths(QString tag);
-};
-
-#endif // TAGMANAGER_H
--- a/shared/token.h
+++ b/shared/token.h
@ -19,8 +19,7 @@ enum TokenType
 	FILTER_PATH_SIZE,
 	FILTER_PATH_ENDS,
 	FILTER_PATH_STARTS,
-	FILTER_TAG_ASSIGNED,
-	FILTER_CONTENT = 512, /* Everything below here is content search (except LIMIT) */
+	FILTER_CONTENT = 512,
 	FILTER_CONTENT_CONTAINS,
 	FILTER_CONTENT_PAGE,
 	LIMIT = 1024
--- a/submodules/exile.h
+++ b/submodules/exile.h