fix unique value issues