discovery: fix watch index
Merge pull request #1934 from xiang90/fix_test

discovery: fix watch index