improve(tag): tag detection and indexing is improved