fix product / order bugs