PIM-2011: Comment the deletion of Tag as searchable entity