There is already a ticket to have a second address line for contacts and I believe it's important this is extended to company addresses as well.