Fix bugs of last commit.
Trigger correct avatar visibilities.