Minor optimization

Removing a recursive call in on of the maps
Fix type in index name, prevent future mistakes by strongly typing
Reuse existing indexes whenever possible