diff --git a/packages/cli/config/index.ts b/packages/cli/config/index.ts
index 9492b4cb6..2759c6d79 100644
--- a/packages/cli/config/index.ts
+++ b/packages/cli/config/index.ts
@@ -185,6 +185,7 @@ const config = convict({
 		// in the editor.
 		saveDataManualExecutions: {
 			doc: 'Save data of executions when started manually via editor',
+			format: 'Boolean',
 			default: false,
 			env: 'EXECUTIONS_DATA_SAVE_MANUAL_EXECUTIONS'
 		},
@@ -196,16 +197,19 @@ const config = convict({
 		// a future version.
 		pruneData: {
 			doc: 'Delete data of past executions on a rolling basis',
+			format: 'Boolean',
 			default: false,
 			env: 'EXECUTIONS_DATA_PRUNE'
 		},
 		pruneDataMaxAge: {
 			doc: 'How old (hours) the execution data has to be to get deleted',
+			format: Number,
 			default: 336,
 			env: 'EXECUTIONS_DATA_MAX_AGE'
 		},
 		pruneDataTimeout: {
 			doc: 'Timeout (seconds) after execution data has been pruned',
+			format: Number,
 			default: 3600,
 			env: 'EXECUTIONS_DATA_PRUNE_TIMEOUT'
 		},
diff --git a/packages/cli/migrations/ormconfig.ts b/packages/cli/migrations/ormconfig.ts
index 2a0cda0d9..1ea583beb 100644
--- a/packages/cli/migrations/ormconfig.ts
+++ b/packages/cli/migrations/ormconfig.ts
@@ -44,9 +44,9 @@ module.exports = [
         "logging": false,
         "host": "localhost",
         "username": "postgres",
-        "password": "docker",
+        "password": "",
         "port": 5432,
-        "database": "postgres",
+        "database": "n8n",
         "schema": "public",
         "entities": Object.values(PostgresDb),
         "migrations": [
@@ -68,7 +68,7 @@ module.exports = [
         "username": "root",
         "password": "password",
         "host": "localhost",
-        "port": "3308",
+        "port": "3306",
         "logging": false,
         "entities": Object.values(MySQLDb),
         "migrations": [
@@ -90,7 +90,7 @@ module.exports = [
         "username": "root",
         "password": "password",
         "host": "localhost",
-        "port": "3308",
+        "port": "3306",
         "logging": false,
         "entities": Object.values(MySQLDb),
         "migrations": [
@@ -105,4 +105,4 @@ module.exports = [
            "subscribersDir": "./src/databases/mysqldb/Subscribers"
         }
     },
-];
\ No newline at end of file
+];
diff --git a/packages/cli/src/Db.ts b/packages/cli/src/Db.ts
index 3739b779e..06eeca797 100644
--- a/packages/cli/src/Db.ts
+++ b/packages/cli/src/Db.ts
@@ -35,21 +35,25 @@ export let collections: IDatabaseCollections = {
 import {
 	InitialMigration1587669153312,
 	WebhookModel1589476000887,
+	CreateIndexStoppedAt1594828256133,
 } from './databases/postgresdb/migrations';
 
 import {
 	InitialMigration1587563438936,
 	WebhookModel1592679094242,
+	CreateIndexStoppedAt1594910478695,
 } from './databases/mongodb/migrations';
 
 import {
 	InitialMigration1588157391238,
 	WebhookModel1592447867632,
+	CreateIndexStoppedAt1594902918301,
 } from './databases/mysqldb/migrations';
 
 import {
 	InitialMigration1588102412422,
 	WebhookModel1592445003908,
+	CreateIndexStoppedAt1594825041918,
 } from './databases/sqlite/migrations';
 
 import * as path from 'path';
@@ -71,7 +75,11 @@ export async function init(): Promise<IDatabaseCollections> {
 				entityPrefix,
 				url: await GenericHelpers.getConfigValue('database.mongodb.connectionUrl') as string,
 				useNewUrlParser: true,
-				migrations: [InitialMigration1587563438936, WebhookModel1592679094242],
+				migrations: [
+					InitialMigration1587563438936,
+					WebhookModel1592679094242,
+					CreateIndexStoppedAt1594910478695,
+				],
 				migrationsRun: true,
 				migrationsTableName: `${entityPrefix}migrations`,
 			};
@@ -104,7 +112,11 @@ export async function init(): Promise<IDatabaseCollections> {
 				port: await GenericHelpers.getConfigValue('database.postgresdb.port') as number,
 				username: await GenericHelpers.getConfigValue('database.postgresdb.user') as string,
 				schema: config.get('database.postgresdb.schema'),
-				migrations: [InitialMigration1587669153312, WebhookModel1589476000887],
+				migrations: [
+					InitialMigration1587669153312,
+					WebhookModel1589476000887,
+					CreateIndexStoppedAt1594828256133,
+				],
 				migrationsRun: true,
 				migrationsTableName: `${entityPrefix}migrations`,
 				ssl,
@@ -123,7 +135,11 @@ export async function init(): Promise<IDatabaseCollections> {
 				password: await GenericHelpers.getConfigValue('database.mysqldb.password') as string,
 				port: await GenericHelpers.getConfigValue('database.mysqldb.port') as number,
 				username: await GenericHelpers.getConfigValue('database.mysqldb.user') as string,
-				migrations: [InitialMigration1588157391238, WebhookModel1592447867632],
+				migrations: [
+					InitialMigration1588157391238,
+					WebhookModel1592447867632,
+					CreateIndexStoppedAt1594902918301,
+				],
 				migrationsRun: true,
 				migrationsTableName: `${entityPrefix}migrations`,
 			};
@@ -135,7 +151,11 @@ export async function init(): Promise<IDatabaseCollections> {
 				type: 'sqlite',
 				database:  path.join(n8nFolder, 'database.sqlite'),
 				entityPrefix,
-				migrations: [InitialMigration1588102412422, WebhookModel1592445003908],
+				migrations: [
+					InitialMigration1588102412422,
+					WebhookModel1592445003908,
+					CreateIndexStoppedAt1594825041918
+				],
 				migrationsRun: true,
 				migrationsTableName: `${entityPrefix}migrations`,
 			};
diff --git a/packages/cli/src/databases/mongodb/ExecutionEntity.ts b/packages/cli/src/databases/mongodb/ExecutionEntity.ts
index ba5071a36..02a639d66 100644
--- a/packages/cli/src/databases/mongodb/ExecutionEntity.ts
+++ b/packages/cli/src/databases/mongodb/ExecutionEntity.ts
@@ -39,6 +39,7 @@ export class ExecutionEntity implements IExecutionFlattedDb {
 	@Column('Date')
 	startedAt: Date;
 
+	@Index()
 	@Column('Date')
 	stoppedAt: Date;
 
diff --git a/packages/cli/src/databases/mongodb/migrations/151594910478695-CreateIndexStoppedAt.ts b/packages/cli/src/databases/mongodb/migrations/151594910478695-CreateIndexStoppedAt.ts
new file mode 100644
index 000000000..9cfe4480d
--- /dev/null
+++ b/packages/cli/src/databases/mongodb/migrations/151594910478695-CreateIndexStoppedAt.ts
@@ -0,0 +1,22 @@
+import { MigrationInterface } from "typeorm";
+import {
+	MongoQueryRunner,
+} from 'typeorm/driver/mongodb/MongoQueryRunner';
+
+import * as config from '../../../../config';
+
+export class CreateIndexStoppedAt1594910478695 implements MigrationInterface {
+    name = 'CreateIndexStoppedAt1594910478695'
+
+    public async up(queryRunner: MongoQueryRunner): Promise<void> {
+		const tablePrefix = config.get('database.tablePrefix');
+		await queryRunner.manager.createCollectionIndex(`${tablePrefix}execution_entity`, 'stoppedAt', { name: `IDX_${tablePrefix}execution_entity_stoppedAt`});
+    }
+
+    public async down(queryRunner: MongoQueryRunner): Promise<void> {
+		const tablePrefix = config.get('database.tablePrefix');
+		await queryRunner.manager.dropCollectionIndex
+		(`${tablePrefix}execution_entity`, `IDX_${tablePrefix}execution_entity_stoppedAt`);
+    }
+
+}
diff --git a/packages/cli/src/databases/mongodb/migrations/index.ts b/packages/cli/src/databases/mongodb/migrations/index.ts
index 4072ab582..ae4a6deb3 100644
--- a/packages/cli/src/databases/mongodb/migrations/index.ts
+++ b/packages/cli/src/databases/mongodb/migrations/index.ts
@@ -1,2 +1,3 @@
 export * from './1587563438936-InitialMigration';
 export * from './1592679094242-WebhookModel';
+export * from './151594910478695-CreateIndexStoppedAt';
diff --git a/packages/cli/src/databases/mysqldb/ExecutionEntity.ts b/packages/cli/src/databases/mysqldb/ExecutionEntity.ts
index e0c084fcf..3db01032b 100644
--- a/packages/cli/src/databases/mysqldb/ExecutionEntity.ts
+++ b/packages/cli/src/databases/mysqldb/ExecutionEntity.ts
@@ -39,6 +39,7 @@ export class ExecutionEntity implements IExecutionFlattedDb {
 	@Column('datetime')
 	startedAt: Date;
 
+	@Index()
 	@Column('datetime')
 	stoppedAt: Date;
 
diff --git a/packages/cli/src/databases/mysqldb/migrations/1594902918301-CreateIndexStoppedAt.ts b/packages/cli/src/databases/mysqldb/migrations/1594902918301-CreateIndexStoppedAt.ts
new file mode 100644
index 000000000..2cc4c8636
--- /dev/null
+++ b/packages/cli/src/databases/mysqldb/migrations/1594902918301-CreateIndexStoppedAt.ts
@@ -0,0 +1,20 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+import * as config from '../../../../config';
+
+export class CreateIndexStoppedAt1594902918301 implements MigrationInterface {
+    name = 'CreateIndexStoppedAt1594902918301'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+		const tablePrefix = config.get('database.tablePrefix');
+
+        await queryRunner.query('CREATE INDEX `IDX_' + tablePrefix + 'cefb067df2402f6aed0638a6c1` ON `' + tablePrefix + 'execution_entity` (`stoppedAt`)');
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+		const tablePrefix = config.get('database.tablePrefix');
+
+        await queryRunner.query('DROP INDEX `IDX_' + tablePrefix + 'cefb067df2402f6aed0638a6c1` ON `' + tablePrefix + 'execution_entity`');
+    }
+
+}
diff --git a/packages/cli/src/databases/mysqldb/migrations/index.ts b/packages/cli/src/databases/mysqldb/migrations/index.ts
index 9e5abd3b8..7c0cb217e 100644
--- a/packages/cli/src/databases/mysqldb/migrations/index.ts
+++ b/packages/cli/src/databases/mysqldb/migrations/index.ts
@@ -1,2 +1,3 @@
 export * from './1588157391238-InitialMigration';
 export * from './1592447867632-WebhookModel';
+export * from './1594902918301-CreateIndexStoppedAt';
diff --git a/packages/cli/src/databases/postgresdb/ExecutionEntity.ts b/packages/cli/src/databases/postgresdb/ExecutionEntity.ts
index 8a7f691f0..8b45336c2 100644
--- a/packages/cli/src/databases/postgresdb/ExecutionEntity.ts
+++ b/packages/cli/src/databases/postgresdb/ExecutionEntity.ts
@@ -39,6 +39,7 @@ export class ExecutionEntity implements IExecutionFlattedDb {
 	@Column('timestamp')
 	startedAt: Date;
 
+	@Index()
 	@Column('timestamp')
 	stoppedAt: Date;
 
diff --git a/packages/cli/src/databases/postgresdb/migrations/1594828256133-CreateIndexStoppedAt.ts b/packages/cli/src/databases/postgresdb/migrations/1594828256133-CreateIndexStoppedAt.ts
new file mode 100644
index 000000000..7dd957863
--- /dev/null
+++ b/packages/cli/src/databases/postgresdb/migrations/1594828256133-CreateIndexStoppedAt.ts
@@ -0,0 +1,25 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+import * as config from '../../../../config';
+
+export class CreateIndexStoppedAt1594828256133 implements MigrationInterface {
+    name = 'CreateIndexStoppedAt1594828256133'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+		let tablePrefix = config.get('database.tablePrefix');
+		const tablePrefixPure = tablePrefix;
+		const schema = config.get('database.postgresdb.schema');
+		if (schema) {
+			tablePrefix = schema + '.' + tablePrefix;
+		}
+
+		await queryRunner.query(`CREATE INDEX IF NOT EXISTS IDX_${tablePrefixPure}33228da131bb1112247cf52a42 ON ${tablePrefix}execution_entity ("stoppedAt") `);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+		let tablePrefix = config.get('database.tablePrefix');
+
+		await queryRunner.query(`DROP INDEX IDX_${tablePrefix}33228da131bb1112247cf52a42`);
+    }
+
+}
diff --git a/packages/cli/src/databases/postgresdb/migrations/index.ts b/packages/cli/src/databases/postgresdb/migrations/index.ts
index 827f01796..3b1053706 100644
--- a/packages/cli/src/databases/postgresdb/migrations/index.ts
+++ b/packages/cli/src/databases/postgresdb/migrations/index.ts
@@ -1,3 +1,4 @@
 export * from './1587669153312-InitialMigration';
 export * from './1589476000887-WebhookModel';
+export * from './1594828256133-CreateIndexStoppedAt';
 
diff --git a/packages/cli/src/databases/sqlite/ExecutionEntity.ts b/packages/cli/src/databases/sqlite/ExecutionEntity.ts
index 825fed7fb..bb7de2605 100644
--- a/packages/cli/src/databases/sqlite/ExecutionEntity.ts
+++ b/packages/cli/src/databases/sqlite/ExecutionEntity.ts
@@ -39,6 +39,7 @@ export class ExecutionEntity implements IExecutionFlattedDb {
 	@Column()
 	startedAt: Date;
 
+	@Index()
 	@Column()
 	stoppedAt: Date;
 
diff --git a/packages/cli/src/databases/sqlite/migrations/1594825041918-CreateIndexStoppedAt.ts b/packages/cli/src/databases/sqlite/migrations/1594825041918-CreateIndexStoppedAt.ts
new file mode 100644
index 000000000..cfa481202
--- /dev/null
+++ b/packages/cli/src/databases/sqlite/migrations/1594825041918-CreateIndexStoppedAt.ts
@@ -0,0 +1,20 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+import * as config from '../../../../config';
+
+export class CreateIndexStoppedAt1594825041918 implements MigrationInterface {
+    name = 'CreateIndexStoppedAt1594825041918'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+		const tablePrefix = config.get('database.tablePrefix');
+
+        await queryRunner.query(`CREATE INDEX "IDX_${tablePrefix}cefb067df2402f6aed0638a6c1" ON "execution_entity" ("stoppedAt") `);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+		const tablePrefix = config.get('database.tablePrefix');
+
+        await queryRunner.query(`DROP INDEX "IDX_${tablePrefix}cefb067df2402f6aed0638a6c1"`);
+    }
+
+}
diff --git a/packages/cli/src/databases/sqlite/migrations/index.ts b/packages/cli/src/databases/sqlite/migrations/index.ts
index a830a007c..f0a2068b9 100644
--- a/packages/cli/src/databases/sqlite/migrations/index.ts
+++ b/packages/cli/src/databases/sqlite/migrations/index.ts
@@ -1,2 +1,3 @@
 export * from './1588102412422-InitialMigration';
 export * from './1592445003908-WebhookModel';
+export * from './1594825041918-CreateIndexStoppedAt'