diff --git a/dict/main.go b/dict/main.go
index 7ac5f0c..142f321 100644
--- a/dict/main.go
+++ b/dict/main.go
@@ -107,9 +107,11 @@ func ParseEntry(entry *jmdict.JmdictEntry, furiganaInfo *string) Entry {
 	kanji := ""
 	if len(entry.Kanji) > 0 {
 		kanji = entry.Kanji[0].Expression
+	} else {
+		kanji = entry.Readings[0].Reading
 	}
 	reading := ""
-	if len(entry.Readings) > 0 {
+	if kanji != "" {
 		reading = entry.Readings[0].Reading
 	}
 	var definitions []Definition
@@ -128,7 +130,7 @@ func ParseEntry(entry *jmdict.JmdictEntry, furiganaInfo *string) Entry {
 	}
 	// 1:ねが;3:いた
 	var furiganaList []Furigana
-	if kanji == "" || *furiganaInfo == "" {
+	if reading == "" || furiganaInfo == nil || *furiganaInfo == "" {
 		furiganaList = []Furigana{{Kanji: reading, Furigana: ""}}
 	} else {
 		furiganaEntries := strings.Split(*furiganaInfo, ";")
diff --git a/dict/templates/partials/entryfull.html b/dict/templates/partials/entryfull.html
index da28fbf..dce3966 100644
--- a/dict/templates/partials/entryfull.html
+++ b/dict/templates/partials/entryfull.html
@@ -1,7 +1,6 @@
 {{ define "entryfull" }}
 <div class="box">
     <h3 lang="ja">
-        <a href="/word/{{ .Kanji }}">
         {{- range .Furigana -}}
             {{- if .Furigana -}}
                 <ruby>{{- .Kanji -}}<rp>(</rp><rt>{{- .Furigana -}}</rt><rp>)</rp></ruby>
@@ -9,7 +8,6 @@
                 {{- .Kanji -}}
             {{- end -}}
         {{- end -}}
-        </a>
     </h3>
     {{- $count := len .Definitions -}}
     {{ if eq $count 1 -}}
diff --git a/dict/templates/search.html b/dict/templates/search.html
index ffa8680..b143d74 100644
--- a/dict/templates/search.html
+++ b/dict/templates/search.html
@@ -3,7 +3,7 @@
 {{- define "value" }}{{ .Query }}{{- end -}}
 
 {{- define "results" -}}
-{{- template "entryfull" .Entry -}}
+{{- template "search" . -}}
 {{- end -}}
 
 {{- template "index" . -}}
\ No newline at end of file