fix bugs #515

Should not be done as picking_type_id can always come from order