fixing bug with goal_orders, improving handling of expiration date validation