Features index tweak