diff --git a/search/query/bool_field.go b/search/query/bool_field.go
index e1b88c11..402724ce 100644
--- a/search/query/bool_field.go
+++ b/search/query/bool_field.go
@@ -40,10 +40,7 @@ func (q *BoolFieldQuery) SetBoost(b float64) {
 }
 
 func (q *BoolFieldQuery) Boost() float64{
-	if q.BoostVal != nil {
 		return q.BoostVal.Value()
-	}
-	return 0
 }
 
 func (q *BoolFieldQuery) SetField(f string) {
@@ -64,5 +61,5 @@ func (q *BoolFieldQuery) Searcher(i index.IndexReader, m mapping.IndexMapping, e
 	if q.Bool {
 		term = "T"
 	}
-	return searcher.NewTermSearcher(i, term, field, q.Boost(), explain)
+	return searcher.NewTermSearcher(i, term, field, q.BoostVal.Value(), explain)
 }
diff --git a/search/query/boolean.go b/search/query/boolean.go
index 902bf66c..2fe75ff9 100644
--- a/search/query/boolean.go
+++ b/search/query/boolean.go
@@ -94,10 +94,7 @@ func (q *BooleanQuery) SetBoost(b float64) {
 }
 
 func (q *BooleanQuery) Boost() float64{
-	if q.BoostVal != nil {
-		return q.BoostVal.Value()
-	}
-	return 0
+	return q.BoostVal.Value()
 }
 
 func (q *BooleanQuery) Searcher(i index.IndexReader, m mapping.IndexMapping, explain bool) (search.Searcher, error) {
diff --git a/search/query/conjunction.go b/search/query/conjunction.go
index 125807f3..e819d697 100644
--- a/search/query/conjunction.go
+++ b/search/query/conjunction.go
@@ -42,10 +42,7 @@ func (q *ConjunctionQuery) SetBoost(b float64) {
 }
 
 func (q *ConjunctionQuery) Boost() float64{
-	if q.BoostVal != nil {
-		return q.BoostVal.Value()
-	}
-	return 0
+	return q.BoostVal.Value()
 }
 
 func (q *ConjunctionQuery) AddQuery(aq ...Query) {
diff --git a/search/query/date_range.go b/search/query/date_range.go
index daccab32..8c5811f1 100644
--- a/search/query/date_range.go
+++ b/search/query/date_range.go
@@ -114,10 +114,7 @@ func (q *DateRangeQuery) SetBoost(b float64) {
 }
 
 func (q *DateRangeQuery) Boost() float64{
-	if q.BoostVal != nil {
-		return q.BoostVal.Value()
-	}
-	return 0
+	return q.BoostVal.Value()
 }
 
 
@@ -140,7 +137,7 @@ func (q *DateRangeQuery) Searcher(i index.IndexReader, m mapping.IndexMapping, e
 		field = m.DefaultSearchField()
 	}
 
-	return searcher.NewNumericRangeSearcher(i, min, max, q.InclusiveStart, q.InclusiveEnd, field, q.Boost(), explain)
+	return searcher.NewNumericRangeSearcher(i, min, max, q.InclusiveStart, q.InclusiveEnd, field, q.BoostVal.Value(), explain)
 }
 
 func (q *DateRangeQuery) parseEndpoints() (*float64, *float64, error) {
diff --git a/search/query/disjunction.go b/search/query/disjunction.go
index ed8e1400..08f47c41 100644
--- a/search/query/disjunction.go
+++ b/search/query/disjunction.go
@@ -44,10 +44,7 @@ func (q *DisjunctionQuery) SetBoost(b float64) {
 }
 
 func (q *DisjunctionQuery) Boost() float64{
-	if q.BoostVal != nil {
-		return q.BoostVal.Value()
-	}
-	return 0
+	return q.BoostVal.Value()
 }
 
 
diff --git a/search/query/docid.go b/search/query/docid.go
index 08527462..c633d947 100644
--- a/search/query/docid.go
+++ b/search/query/docid.go
@@ -41,12 +41,9 @@ func (q *DocIDQuery) SetBoost(b float64) {
 }
 
 func (q *DocIDQuery) Boost() float64{
-	if q.BoostVal != nil {
-		return q.BoostVal.Value()
-	}
-	return 0
+	return q.BoostVal.Value()
 }
 
 func (q *DocIDQuery) Searcher(i index.IndexReader, m mapping.IndexMapping, explain bool) (search.Searcher, error) {
-	return searcher.NewDocIDSearcher(i, q.IDs, q.Boost(), explain)
+	return searcher.NewDocIDSearcher(i, q.IDs, q.BoostVal.Value(), explain)
 }
diff --git a/search/query/fuzzy.go b/search/query/fuzzy.go
index d9ca0ea3..6effd343 100644
--- a/search/query/fuzzy.go
+++ b/search/query/fuzzy.go
@@ -49,10 +49,7 @@ func (q *FuzzyQuery) SetBoost(b float64) {
 }
 
 func (q *FuzzyQuery) Boost() float64{
-	if q.BoostVal != nil {
-		return q.BoostVal.Value()
-	}
-	return 0
+	return q.BoostVal.Value()
 }
 
 func (q *FuzzyQuery) SetField(f string) {
@@ -76,5 +73,5 @@ func (q *FuzzyQuery) Searcher(i index.IndexReader, m mapping.IndexMapping, expla
 	if q.FieldVal == "" {
 		field = m.DefaultSearchField()
 	}
-	return searcher.NewFuzzySearcher(i, q.Term, q.Prefix, q.Fuzziness, field, q.Boost(), explain)
+	return searcher.NewFuzzySearcher(i, q.Term, q.Prefix, q.Fuzziness, field, q.BoostVal.Value(), explain)
 }
diff --git a/search/query/match.go b/search/query/match.go
index 18ff9b72..6d0b0053 100644
--- a/search/query/match.go
+++ b/search/query/match.go
@@ -91,10 +91,7 @@ func (q *MatchQuery) SetBoost(b float64) {
 }
 
 func (q *MatchQuery) Boost() float64{
-	if q.BoostVal != nil {
-		return q.BoostVal.Value()
-	}
-	return 0
+	return q.BoostVal.Value()
 }
 
 func (q *MatchQuery) SetField(f string) {
@@ -146,14 +143,14 @@ func (q *MatchQuery) Searcher(i index.IndexReader, m mapping.IndexMapping, expla
 				query.SetFuzziness(q.Fuzziness)
 				query.SetPrefix(q.Prefix)
 				query.SetField(field)
-				query.SetBoost(q.Boost())
+				query.SetBoost(q.BoostVal.Value())
 				tqs[i] = query
 			}
 		} else {
 			for i, token := range tokens {
 				tq := NewTermQuery(string(token.Term))
 				tq.SetField(field)
-				tq.SetBoost(q.Boost())
+				tq.SetBoost(q.BoostVal.Value())
 				tqs[i] = tq
 			}
 		}
@@ -162,12 +159,12 @@ func (q *MatchQuery) Searcher(i index.IndexReader, m mapping.IndexMapping, expla
 		case MatchQueryOperatorOr:
 			shouldQuery := NewDisjunctionQuery(tqs)
 			shouldQuery.SetMin(1)
-			shouldQuery.SetBoost(q.Boost())
+			shouldQuery.SetBoost(q.BoostVal.Value())
 			return shouldQuery.Searcher(i, m, explain)
 
 		case MatchQueryOperatorAnd:
 			mustQuery := NewConjunctionQuery(tqs)
-			mustQuery.SetBoost(q.Boost())
+			mustQuery.SetBoost(q.BoostVal.Value())
 			return mustQuery.Searcher(i, m, explain)
 
 		default:
diff --git a/search/query/match_all.go b/search/query/match_all.go
index 347f20ba..9eb7eb95 100644
--- a/search/query/match_all.go
+++ b/search/query/match_all.go
@@ -39,16 +39,13 @@ func (q *MatchAllQuery) SetBoost(b float64) {
 }
 
 func (q *MatchAllQuery) Boost() float64{
-	if q.BoostVal != nil {
-		return q.BoostVal.Value()
-	}
-	return 0
+	return q.BoostVal.Value()
 }
 
 
 
 func (q *MatchAllQuery) Searcher(i index.IndexReader, m mapping.IndexMapping, explain bool) (search.Searcher, error) {
-	return searcher.NewMatchAllSearcher(i, q.Boost(), explain)
+	return searcher.NewMatchAllSearcher(i, q.BoostVal.Value(), explain)
 }
 
 func (q *MatchAllQuery) MarshalJSON() ([]byte, error) {
diff --git a/search/query/match_none.go b/search/query/match_none.go
index 34391674..5264c5a6 100644
--- a/search/query/match_none.go
+++ b/search/query/match_none.go
@@ -39,10 +39,7 @@ func (q *MatchNoneQuery) SetBoost(b float64) {
 }
 
 func (q *MatchNoneQuery) Boost() float64{
-	if q.BoostVal != nil {
-		return q.BoostVal.Value()
-	}
-	return 0
+	return q.BoostVal.Value()
 }
 
 func (q *MatchNoneQuery) Searcher(i index.IndexReader, m mapping.IndexMapping, explain bool) (search.Searcher, error) {
diff --git a/search/query/match_phrase.go b/search/query/match_phrase.go
index 7dc5f7d8..a148808f 100644
--- a/search/query/match_phrase.go
+++ b/search/query/match_phrase.go
@@ -50,10 +50,7 @@ func (q *MatchPhraseQuery) SetBoost(b float64) {
 }
 
 func (q *MatchPhraseQuery) Boost() float64{
-	if q.BoostVal != nil {
-		return q.BoostVal.Value()
-	}
-	return 0
+	return q.BoostVal.Value()
 }
 
 func (q *MatchPhraseQuery) SetField(f string) {
@@ -85,7 +82,7 @@ func (q *MatchPhraseQuery) Searcher(i index.IndexReader, m mapping.IndexMapping,
 	if len(tokens) > 0 {
 		phrase := tokenStreamToPhrase(tokens)
 		phraseQuery := NewPhraseQuery(phrase, field)
-		phraseQuery.SetBoost(q.Boost())
+		phraseQuery.SetBoost(q.BoostVal.Value())
 		return phraseQuery.Searcher(i, m, explain)
 	}
 	noneQuery := NewMatchNoneQuery()
diff --git a/search/query/numeric_range.go b/search/query/numeric_range.go
index e07972d8..93f7fd6b 100644
--- a/search/query/numeric_range.go
+++ b/search/query/numeric_range.go
@@ -60,10 +60,7 @@ func (q *NumericRangeQuery) SetBoost(b float64) {
 }
 
 func (q *NumericRangeQuery) Boost() float64{
-	if q.BoostVal != nil {
-		return q.BoostVal.Value()
-	}
-	return 0
+	return q.BoostVal.Value()
 }
 
 func (q *NumericRangeQuery) SetField(f string) {
@@ -79,7 +76,7 @@ func (q *NumericRangeQuery) Searcher(i index.IndexReader, m mapping.IndexMapping
 	if q.FieldVal == "" {
 		field = m.DefaultSearchField()
 	}
-	return searcher.NewNumericRangeSearcher(i, q.Min, q.Max, q.InclusiveMin, q.InclusiveMax, field, q.Boost(), explain)
+	return searcher.NewNumericRangeSearcher(i, q.Min, q.Max, q.InclusiveMin, q.InclusiveMax, field, q.BoostVal.Value(), explain)
 }
 
 func (q *NumericRangeQuery) Validate() error {
diff --git a/search/query/phrase.go b/search/query/phrase.go
index 0ab8f575..0cd608b8 100644
--- a/search/query/phrase.go
+++ b/search/query/phrase.go
@@ -59,10 +59,7 @@ func (q *PhraseQuery) SetBoost(b float64) {
 }
 
 func (q *PhraseQuery) Boost() float64{
-	if q.BoostVal != nil {
-		return q.BoostVal.Value()
-	}
-	return 0
+	return q.BoostVal.Value()
 }
 
 func (q *PhraseQuery) Searcher(i index.IndexReader, m mapping.IndexMapping, explain bool) (search.Searcher, error) {
diff --git a/search/query/prefix.go b/search/query/prefix.go
index bdf412e2..d8c2bb2f 100644
--- a/search/query/prefix.go
+++ b/search/query/prefix.go
@@ -42,10 +42,7 @@ func (q *PrefixQuery) SetBoost(b float64) {
 }
 
 func (q *PrefixQuery) Boost() float64{
-	if q.BoostVal != nil {
-		return q.BoostVal.Value()
-	}
-	return 0
+	return q.BoostVal.Value()
 }
 
 func (q *PrefixQuery) SetField(f string) {
@@ -61,5 +58,5 @@ func (q *PrefixQuery) Searcher(i index.IndexReader, m mapping.IndexMapping, expl
 	if q.FieldVal == "" {
 		field = m.DefaultSearchField()
 	}
-	return searcher.NewTermPrefixSearcher(i, q.Prefix, field, q.Boost(), explain)
+	return searcher.NewTermPrefixSearcher(i, q.Prefix, field, q.BoostVal.Value(), explain)
 }
diff --git a/search/query/query_string.go b/search/query/query_string.go
index 366cce04..d8f421f4 100644
--- a/search/query/query_string.go
+++ b/search/query/query_string.go
@@ -40,10 +40,7 @@ func (q *QueryStringQuery) SetBoost(b float64) {
 }
 
 func (q *QueryStringQuery) Boost() float64{
-	if q.BoostVal != nil {
-		return q.BoostVal.Value()
-	}
-	return 0
+	return q.BoostVal.Value()
 }
 
 func (q *QueryStringQuery) Searcher(i index.IndexReader, m mapping.IndexMapping, explain bool) (search.Searcher, error) {
diff --git a/search/query/regexp.go b/search/query/regexp.go
index 42cf4f5e..21d29b71 100644
--- a/search/query/regexp.go
+++ b/search/query/regexp.go
@@ -46,10 +46,7 @@ func (q *RegexpQuery) SetBoost(b float64) {
 }
 
 func (q *RegexpQuery) Boost() float64{
-	if q.BoostVal != nil {
-		return q.BoostVal.Value()
-	}
-	return 0
+	return q.BoostVal.Value()
 }
 
 func (q *RegexpQuery) SetField(f string) {
@@ -70,7 +67,7 @@ func (q *RegexpQuery) Searcher(i index.IndexReader, m mapping.IndexMapping, expl
 		return nil, err
 	}
 
-	return searcher.NewRegexpSearcher(i, q.compiled, field, q.Boost(), explain)
+	return searcher.NewRegexpSearcher(i, q.compiled, field, q.BoostVal.Value(), explain)
 }
 
 func (q *RegexpQuery) Validate() error {
diff --git a/search/query/term.go b/search/query/term.go
index 199a1626..0e939ad3 100644
--- a/search/query/term.go
+++ b/search/query/term.go
@@ -41,10 +41,7 @@ func (q *TermQuery) SetBoost(b float64) {
 }
 
 func (q *TermQuery) Boost() float64{
-	if q.BoostVal != nil {
-		return q.BoostVal.Value()
-	}
-	return 0
+	return q.BoostVal.Value()
 }
 
 func (q *TermQuery) SetField(f string) {
@@ -60,5 +57,5 @@ func (q *TermQuery) Searcher(i index.IndexReader, m mapping.IndexMapping, explai
 	if q.FieldVal == "" {
 		field = m.DefaultSearchField()
 	}
-	return searcher.NewTermSearcher(i, q.Term, field, q.Boost(), explain)
+	return searcher.NewTermSearcher(i, q.Term, field, q.BoostVal.Value(), explain)
 }
diff --git a/search/query/wildcard.go b/search/query/wildcard.go
index 7b6bdef8..51a8cdef 100644
--- a/search/query/wildcard.go
+++ b/search/query/wildcard.go
@@ -67,10 +67,7 @@ func (q *WildcardQuery) SetBoost(b float64) {
 }
 
 func (q *WildcardQuery) Boost() float64{
-	if q.BoostVal != nil {
-		return q.BoostVal.Value()
-	}
-	return 0
+	return q.BoostVal.Value()
 }
 
 func (q *WildcardQuery) SetField(f string) {
@@ -94,7 +91,7 @@ func (q *WildcardQuery) Searcher(i index.IndexReader, m mapping.IndexMapping, ex
 		}
 	}
 
-	return searcher.NewRegexpSearcher(i, q.compiled, field, q.Boost(), explain)
+	return searcher.NewRegexpSearcher(i, q.compiled, field, q.BoostVal.Value(), explain)
 }
 
 func (q *WildcardQuery) Validate() error {