Fixed search indexes
Merge branch 'master' into kingman