watched groups fixes