Refactor Index, FilterIndex and add At
Add missing changes