Add key to service form, and validate
Add test for watches where two services have the same key
Add more test cases around filtering watches