extract refactor
index name bugfix