Better search for correct service method. Bugfixing.