Issue #367: Added extra path conditions for Comments.