Fixed issues in AnnotationService and HTMLService
Moved HTML processing to HTMLService, inheritance changes in entities