Improve validate tags and validate '<tag>' in '<tag>'