Fix watch by namespace

Fixes #2071