Fixes custom values collation error
Merges collation fixes
Adds missing apostrophe