added check for other tags