ISSUE-22 handle unique fields