Watch: Fix bad etcd indexing