add indexes to relations
Merge branch 'master' into 219-use-caching