More fixes to selection and hovering