Fixed unique parsing to take into account that not all values are strings anymore.