Fix translate of customer id and add joins for filtering on merchant_id in some places