Optimisation and event view tooltip bug fix