yet more index tweaks