Added initial support for more than 10 addresses (still doesn't display more than 10)