Improved the Shipping class field in quick edit and bulk edit, closes #6681