Fix issue with copsonsored unique values