Fix issue with wrong items highlighting