half fix star & name problem on remove on events