fix for empty comments and captions bug, refactoring