more fixes to hover state with wholerow - close #487