Added tags detection