ADDED: support old style tag indication