Updated checks to include all tags