Fixed work address prepopulator for new labels. #3029
Fixed specs to better represent reality. This also addresses #3566