current element highlight fix + lap support