Made comparator cares about null

[#76341694]
Convetion restored :)

[2186d74a45cf9bd9426873c1a24247c2bf461b83]
Added promoting&highlighting team leader

[#75690346]