Revised logic in data conversion to account for when dataFilter modifies the dataType...