WP-1141 fix service-id evaluation

http://jira.webinos.org/browse/WP-1141