Minor fix for indexer and json test template.