Highlighting working in both directions
plus fix for duplicate call in infinite scroll