find service fixed

jira issue: WP-1178
Merge pull request #12 from krishnabangalore/WP-1178_FindService

find service fixed