added type vs date and type vs correct data