Fixed indexing to use json settings