Fixed issues with Add Service functionality.