fix url for annotation service in freemarker template
standardise use of collection instead of map for freemarker annotation
variable