fix the way we are grabbing the soap operation and service
Merge branch 'master' into stable