big restructuring: part III (database indexer)