Fixes to annotationURL creation