new fixes for onclick