Added additional check to shipping and billing to only show them when it is set to true