Further tweaking of index and other related issues