Fix duplicate item false positive on optional get_or_create params