Added shortnames and addresses to tooltips