Fix whitespace for tpl processor
Fix annotiation links