Fix additional tag collapsed icon
Fix setting key on address fields