improve locators

improve locators part 2
improve logging
Merge pull request #1036 from a-chumagin/master

Improve locators