Two bugfix
Don't duplicate address from API