Fix double encode in annotations list
Merge remote-tracking branch 'origin/master'