diff --git a/db/rocksdb_ethereumtype.go b/db/rocksdb_ethereumtype.go
index 0f7f95f1..13457c7c 100644
--- a/db/rocksdb_ethereumtype.go
+++ b/db/rocksdb_ethereumtype.go
@@ -1025,8 +1025,10 @@ func (d *RocksDB) disconnectBlockTxsEthereumType(wb *gorocksdb.WriteBatch, heigh
 			if err := d.disconnectAddress(blockTx.btxID, false, c.from, c, addresses, contracts); err != nil {
 				return err
 			}
-			if err := d.disconnectAddress(blockTx.btxID, false, c.to, c, addresses, contracts); err != nil {
-				return err
+			if !bytes.Equal(c.from, c.to) {
+				if err := d.disconnectAddress(blockTx.btxID, false, c.to, c, addresses, contracts); err != nil {
+					return err
+				}
 			}
 		}
 		wb.DeleteCF(d.cfh[cfTransactions], blockTx.btxID)
diff --git a/static/templates/address.html b/static/templates/address.html
index 730355ae..c662ff12 100644
--- a/static/templates/address.html
+++ b/static/templates/address.html
@@ -71,10 +71,7 @@
                                 <tr>
                                     <td class="data ellipsis">{{if $t.Contract}}<a href="/address/{{$t.Contract}}">{{$t.Name}}</a>{{else}}{{$t.Name}}{{end}}</td>
                                     <td class="data">
-                                        {{range $i, $iv := $t.Ids}}
-                                            {{if $i}}, {{end}}
-                                            {{formatAmountWithDecimals $iv 0}}
-                                        {{end}}
+                                        {{range $i, $iv := $t.Ids}}{{if $i}}, {{end}}{{formatAmountWithDecimals $iv 0}}{{end}}
                                     </td>
                                     <td class="data">{{$t.Transfers}}</td>
                                 </tr>
@@ -101,10 +98,7 @@
                                 <tr>
                                     <td class="data ellipsis">{{if $t.Contract}}<a href="/address/{{$t.Contract}}">{{$t.Name}}</a>{{else}}{{$t.Name}}{{end}}</td>
                                     <td class="data">
-                                    {{range $i, $iv := $t.IdValues}}
-                                        {{if $i}}, {{end}}
-                                        {{formatAmountWithDecimals $iv.Id 0}}:{{formatAmountWithDecimals $iv.Value 0}} {{$t.Symbol}}
-                                    {{end}}
+                                    {{range $i, $iv := $t.IdValues}}{{if $i}}, {{end}}{{formatAmountWithDecimals $iv.Id 0}}:{{formatAmountWithDecimals $iv.Value 0}} {{$t.Symbol}}{{end}}
                                     </td>
                                     <td class="data">{{$t.Transfers}}</td>
                                 </tr>