watch index improvements