fixed more onclick conditions