Tag and Comment Entity code refactoring