Register fix and include register in index