indexer fixes, interface