Fix orders coming in for merchants