Improved Design of Onboard Control of Refueling Emissions