Only consider elements from model that require a comment
Bug fix #374