Properly support unique by nullable field