LPS-50567 don't force a fixed width
LPS-50649 fix condition and add classNameId