LPS-50649 fix condition and add classNameId