updated checks to include additional elements/tags