Annotations finally fully works online and offline