Fix some style errors
Encode the notified service
Encode the default organization
Merge pull request #223 from telefonicaid/bug/200

bug/200