Features index tweaks