Added a query + title generator as well, also fixed a couple of minor errors