Fixed issue with row highlighting