diff --git a/install/data/sql.sql b/install/data/sql.sql
index b9bc7d89..02010192 100644
--- a/install/data/sql.sql
+++ b/install/data/sql.sql
@@ -604,7 +604,8 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%farmlist` (
  `wref` int(11) NULL,
  `owner` int(11) NULL,
  `name` varchar(100) NULL,
- PRIMARY KEY (`id`)
+ PRIMARY KEY (`id`),
+ KEY `wref` (`wref`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
 
 --
@@ -1220,7 +1221,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%raidlist` (
  `towref` int(11) NULL,
  `x` int(11) NULL,
  `y` int(11) NULL,
- `distance` varchar(5) NULL DEFAULT '0',
+ `distance` FLOAT NULL DEFAULT '0',
  `t1` int(11) NULL,
  `t2` int(11) NULL,
  `t3` int(11) NULL,
@@ -1231,7 +1232,8 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%raidlist` (
  `t8` int(11) NULL,
  `t9` int(11) NULL,
  `t10` int(11) NULL,
- PRIMARY KEY (`id`)
+ PRIMARY KEY (`id`),
+ KEY `lid-distance` (`lid`, `distance`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
 
 --
@@ -1585,7 +1587,8 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%users` (
   KEY `timestamp-tribe` (`timestamp`,`tribe`),
   KEY `access` (`access`),
   KEY `sit1` (`sit1`),
-  KEY `sit2` (`sit2`)
+  KEY `sit2` (`sit2`),
+  KEY `gold` (`gold`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=5 ;
 
 --
diff --git a/sql_updates.txt b/sql_updates.txt
index e5560d04..3a0d1483 100644
--- a/sql_updates.txt
+++ b/sql_updates.txt
@@ -21,6 +21,10 @@ ALTER TABLE `s1_alidata` ADD INDEX(`name`);
 ALTER TABLE `s1_alidata` ADD INDEX(`leader`);
 ALTER TABLE `s1_ali_invite` ADD INDEX `alliance-accept` (`alliance`, `accept`);
 ALTER TABLE `s1_ali_invite` ADD INDEX(`uid`);
+ALTER TABLE `s1_users` ADD INDEX(`gold`);
+ALTER TABLE `s1_farmlist` ADD INDEX(`owner`);
+ALTER TABLE `s1_raidlist` CHANGE  `distance`  `distance` FLOAT NULL DEFAULT  '0';
+ALTER TABLE `s1_raidlist` ADD INDEX `lid-distance` (`lid`, `distance`);
 
 
 -- 23.10.2017 -> SQL optimizations