Added Index -> Fields and Keywords -> Index map