Moved query from Comment entity to the repository.