fix hover callback issues

fixes #1889, fixes #1884

hope this doesn't break something else