fix tooltip issues