find service fixed

jira issue: WP-1178

Find service fixed