Fixing issues with highlights and note feature