Fix highlight missing on pagination