Dashboard: back port of tooltip fixes for #691, and #695