More data, fixes missing tags