updated checks with more tags