Ignore empty values in tax scheme/service type fields (#564)