LPS-50608 use correct identifier / finder