Fix #394: Optimise performance for adding or updating annotation in the list.