Improve handling 'empty'/null string in Service fields