Fix routing method to handle missing argument properly
Revert notification email to send email only to watcher