better keys also for indexer