Fixed translation and item indexing