Homestyx hydra

R1:16a287644848

Fix watcher query to work correctly with no watchers.
Repository: R1 hydra
Commit Date: May 20 2014