Fixed issues in AnnotationService and HTMLService
Fixed issue with cached info not being returned to FE
Moved HTML processing to HTMLService, inheritance changes in entities