Fixed slow loading for events controller indexes
Merge branch 'master' into production