diff --git a/Database/Bloodhound.hs b/Database/Bloodhound.hs
--- a/Database/Bloodhound.hs
+++ b/Database/Bloodhound.hs
@@ -1,9 +1,7 @@
 module Database.Bloodhound
        ( module Database.Bloodhound.Client
        , module Database.Bloodhound.Types
-       , module Database.Bloodhound.Types.Instances
        ) where
 
 import Database.Bloodhound.Client
 import Database.Bloodhound.Types
-import Database.Bloodhound.Types.Instances
diff --git a/Database/Bloodhound/Client.hs b/Database/Bloodhound/Client.hs
--- a/Database/Bloodhound/Client.hs
+++ b/Database/Bloodhound/Client.hs
@@ -35,7 +35,6 @@
 import Prelude hiding (head, filter)
 
 import Database.Bloodhound.Types
-import Database.Bloodhound.Types.Instances
 
 -- find way to avoid destructuring Servers and Indexes?
 -- make get, post, put, delete helpers.
diff --git a/Database/Bloodhound/Types.hs b/Database/Bloodhound/Types.hs
--- a/Database/Bloodhound/Types.hs
+++ b/Database/Bloodhound/Types.hs
@@ -1,4 +1,5 @@
 {-# LANGUAGE DeriveGeneric #-}
+{-# LANGUAGE RecordWildCards #-}
 
 {-| Data types for describing actions and data structures performed to interact
     with Elasticsearch. The two main buckets your queries against Elasticsearch
@@ -12,8 +13,6 @@
        ( defaultCache
        , defaultIndexSettings
        , halfRangeToKV
-       , maybeJson
-       , maybeJsonF
        , mkSort
        , rangeToKV
        , showText
@@ -141,20 +140,26 @@
        , EnablePositionIncrements(..)
        , SimpleQueryFlag(..)
        , FieldOrFields(..)
+       , Monoid(..)
+       , ToJSON(..)
          ) where
 
+import Control.Applicative
 import Data.Aeson
 import qualified Data.ByteString.Lazy.Char8 as L
-import Data.List.NonEmpty (NonEmpty)
+import Data.List (nub)
+import Data.List.NonEmpty (NonEmpty(..))
+import Data.Monoid
 import Data.Text (Text)
 import qualified Data.Text as T
 import Data.Time.Clock (UTCTime)
-import Database.Bloodhound.Types.Class
 import GHC.Generics (Generic)
 import Network.HTTP.Client
 import qualified Network.HTTP.Types.Method as NHTM
 
+import Database.Bloodhound.Types.Class
 
+
 {-| 'Version' is embedded in 'Status' -}
 data Version = Version { number          :: Text
                        , build_hash      :: Text
@@ -791,7 +796,7 @@
             | IdentityFilter
             | BoolFilter BoolMatch
             | ExistsFilter FieldName -- always cached
-            | GeoBoundingBoxFilter GeoBoundingBoxConstraint GeoFilterType
+            | GeoBoundingBoxFilter GeoBoundingBoxConstraint
             | GeoDistanceFilter GeoPoint Distance DistanceType OptimizeBbox Cache
             | GeoDistanceRangeFilter GeoPoint DistanceRange
             | GeoPolygonFilter FieldName [LatLon]
@@ -875,6 +880,7 @@
   GeoBoundingBoxConstraint { geoBBField        :: FieldName
                            , constraintBox     :: GeoBoundingBox
                            , bbConstraintcache :: Cache
+                           , geoType           :: GeoFilterType
                            } deriving (Eq, Show)
 
 data GeoPoint =
@@ -931,14 +937,768 @@
               , shardsSuccessful :: Int
               , shardsFailed     :: Int } deriving (Eq, Show, Generic)
 
-maybeJson :: ToJSON a => Text -> Maybe a -> [(Text, Value)]
-maybeJson field (Just value) = [field .= toJSON value]
-maybeJson _ _ = []
-
-maybeJsonF :: (ToJSON (f Value), ToJSON a, Functor f) =>
-             Text -> Maybe (f a) -> [(Text, Value)]
-maybeJsonF field (Just value) = [field .= fmap toJSON value]
-maybeJsonF _ _ = []
-
 showText :: Show a => a -> Text
 showText = T.pack . show
+
+
+instance Monoid Filter where
+  mempty = IdentityFilter
+  mappend a b = AndFilter [a, b] defaultCache
+
+instance Seminearring Filter where
+  a <||> b = OrFilter [a, b] defaultCache
+
+instance ToJSON Filter where
+  toJSON (AndFilter filters cache) =
+    object ["and"     .=
+            object [ "filters" .= fmap toJSON filters
+                   , "_cache" .= cache]]
+
+  toJSON (OrFilter filters cache) =
+    object ["or"      .= fmap toJSON filters
+           , "_cache" .= cache]
+
+  toJSON (NotFilter notFilter cache) =
+    object ["not" .=
+            object ["filter"  .= toJSON notFilter
+                   , "_cache" .= cache]]
+
+  toJSON (IdentityFilter) =
+    object ["match_all" .= object []]
+
+  toJSON (TermFilter (Term termFilterField termFilterValue) cache) =
+    object ["term" .= object base]
+    where base = [termFilterField .= termFilterValue,
+                  "_cache"        .= cache]
+
+  toJSON (ExistsFilter (FieldName fieldName)) =
+    object ["exists"  .= object
+            ["field"  .= fieldName]]
+
+  toJSON (BoolFilter boolMatch) =
+    object ["bool"    .= toJSON boolMatch]
+
+  toJSON (GeoBoundingBoxFilter bbConstraint) =
+    object ["geo_bounding_box" .= toJSON bbConstraint]
+
+  toJSON (GeoDistanceFilter (GeoPoint (FieldName distanceGeoField) geoDistLatLon)
+          distance distanceType optimizeBbox cache) =
+    object ["geo_distance" .=
+            object ["distance" .= toJSON distance
+                   , "distance_type" .= toJSON distanceType
+                   , "optimize_bbox" .= optimizeBbox
+                   , distanceGeoField .= toJSON geoDistLatLon
+                   , "_cache" .= cache]]
+
+  toJSON (GeoDistanceRangeFilter (GeoPoint (FieldName gddrField) drLatLon)
+          (DistanceRange geoDistRangeDistFrom drDistanceTo)) =
+    object ["geo_distance_range" .=
+            object ["from" .= toJSON geoDistRangeDistFrom
+                   , "to"  .= toJSON drDistanceTo
+                   , gddrField .= toJSON drLatLon]]
+
+  toJSON (GeoPolygonFilter (FieldName geoPolygonFilterField) latLons) =
+    object ["geo_polygon" .=
+            object [geoPolygonFilterField .=
+                    object ["points" .= fmap toJSON latLons]]]
+
+  toJSON (IdsFilter (MappingName mappingName) values) =
+    object ["ids" .=
+            object ["type" .= mappingName
+                   , "values" .= fmap (T.pack . unpackId) values]]
+
+  toJSON (LimitFilter limit) =
+    object ["limit" .= object ["value" .= limit]]
+
+  toJSON (MissingFilter (FieldName fieldName) (Existence existence) (NullValue nullValue)) =
+    object ["missing" .=
+            object ["field"       .= fieldName
+                   , "existence"  .= existence
+                   , "null_value" .= nullValue]]
+
+  toJSON (PrefixFilter (FieldName fieldName) fieldValue cache) =
+    object ["prefix" .=
+            object [fieldName .= fieldValue
+                   , "_cache" .= cache]]
+
+  toJSON (RangeFilter (FieldName fieldName) (Left halfRange) rangeExecution cache) =
+    object ["range" .=
+            object [fieldName .=
+                    object [key .= val]
+                   , "execution" .= toJSON rangeExecution
+                   , "_cache" .= cache]]
+    where
+      (key, val) = halfRangeToKV halfRange
+
+  toJSON (RangeFilter (FieldName fieldName) (Right range) rangeExecution cache) =
+    object ["range" .=
+            object [fieldName .=
+                    object [lessKey .= lessVal
+                           , greaterKey .= greaterVal]
+                   , "execution" .= toJSON rangeExecution
+                   , "_cache" .= cache]]
+    where
+      (lessKey, lessVal, greaterKey, greaterVal) = rangeToKV range
+
+  toJSON (RegexpFilter (FieldName fieldName)
+          (Regexp regexText) flags (CacheName cacheName) cache (CacheKey cacheKey)) =
+    object ["regexp" .=
+            object [fieldName .=
+                    object ["value"  .= regexText
+                           , "flags" .= toJSON flags]
+                   , "_name"      .= cacheName
+                   , "_cache"     .= cache
+                   , "_cache_key" .= cacheKey]]
+
+instance ToJSON GeoPoint where
+  toJSON (GeoPoint (FieldName geoPointField) geoPointLatLon) =
+    object [ geoPointField  .= toJSON geoPointLatLon ]
+
+
+instance ToJSON Query where
+  toJSON (TermQuery (Term termQueryField termQueryValue) boost) =
+    object [ "term" .=
+             object [termQueryField .= object merged]]
+    where
+      base = [ "value" .= termQueryValue ]
+      boosted = maybe [] (return . ("boost" .=)) boost
+      merged = mappend base boosted
+
+  toJSON (TermsQuery terms termsQueryMinimumMatch) =
+    object [ "terms" .= object conjoined ]
+    where conjoined =
+            [ "tags"                 .= fmap toJSON terms
+            , "minimum_should_match" .= toJSON termsQueryMinimumMatch ]
+
+  toJSON (IdsQuery idsQueryMappingName docIds) =
+    object [ "ids" .= object conjoined ]
+    where conjoined = [ "type"   .= toJSON idsQueryMappingName
+                      , "values" .= fmap toJSON docIds ]
+
+  toJSON (QueryQueryStringQuery qQueryStringQuery) =
+    object [ "query_string" .= toJSON qQueryStringQuery ]
+
+  toJSON (QueryMatchQuery matchQuery) =
+    object [ "match" .= toJSON matchQuery ]
+
+  toJSON (QueryMultiMatchQuery multiMatchQuery) =
+    object [ "multi_match" .= toJSON multiMatchQuery ]
+
+  toJSON (QueryBoolQuery boolQuery) =
+    object [ "bool" .= toJSON boolQuery ]
+
+  toJSON (QueryBoostingQuery boostingQuery) =
+    object [ "boosting" .= toJSON boostingQuery ]
+
+  toJSON (QueryCommonTermsQuery commonTermsQuery) =
+    object [ "common" .= toJSON commonTermsQuery ]
+
+  toJSON (ConstantScoreFilter csFilter boost) =
+    object [ "constant_score" .= toJSON csFilter
+           , "boost" .= toJSON boost]
+
+  toJSON (ConstantScoreQuery query boost) =
+    object [ "constant_score" .= toJSON query
+           , "boost"          .= toJSON boost]
+
+  toJSON (QueryDisMaxQuery disMaxQuery) =
+    object [ "dis_max" .= toJSON disMaxQuery ]
+
+  toJSON (QueryFilteredQuery qFilteredQuery) =
+    object [ "filtered" .= toJSON qFilteredQuery ]
+
+  toJSON (QueryFuzzyLikeThisQuery fuzzyQuery) =
+    object [ "fuzzy_like_this" .= toJSON fuzzyQuery ]
+
+  toJSON (QueryFuzzyLikeFieldQuery fuzzyFieldQuery) =
+    object [ "fuzzy_like_this_field" .= toJSON fuzzyFieldQuery ]
+
+  toJSON (QueryFuzzyQuery fuzzyQuery) =
+    object [ "fuzzy" .= toJSON fuzzyQuery ]
+
+  toJSON (QueryHasChildQuery childQuery) =
+    object [ "has_child" .= toJSON childQuery ]
+
+  toJSON (QueryHasParentQuery parentQuery) =
+    object [ "has_parent" .= toJSON parentQuery ]
+
+  toJSON (QueryIndicesQuery qIndicesQuery) =
+    object [ "indices" .= toJSON qIndicesQuery ]
+
+  toJSON (MatchAllQuery boost) =
+    object [ "match_all" .= omitNulls [ "boost" .= boost ] ]
+
+  toJSON (QueryMoreLikeThisQuery query) =
+    object [ "more_like_this" .= toJSON query ]
+
+  toJSON (QueryMoreLikeThisFieldQuery query) =
+    object [ "more_like_this_field" .= toJSON query ]
+
+  toJSON (QueryNestedQuery query) =
+    object [ "nested" .= toJSON query ]
+
+  toJSON (QueryPrefixQuery query) =
+    object [ "prefix" .= toJSON query ]
+
+  toJSON (QueryRangeQuery query) =
+    object [ "range"  .= toJSON query ]
+
+  toJSON (QueryRegexpQuery query) =
+    object [ "regexp" .= toJSON query ]
+
+  toJSON (QuerySimpleQueryStringQuery query) =
+    object [ "simple_query_string" .= toJSON query ]
+
+
+omitNulls :: [(Text, Value)] -> Value
+omitNulls = object . filter notNull where
+  notNull (_, Null) = False
+  notNull _         = True
+
+
+instance ToJSON SimpleQueryStringQuery where
+  toJSON SimpleQueryStringQuery {..} =
+    omitNulls (base ++ maybeAdd)
+    where base = [ "query" .= toJSON simpleQueryStringQuery ]
+          maybeAdd = [ "fields" .= simpleQueryStringField
+                     , "default_operator" .= simpleQueryStringOperator
+                     , "analyzer" .= simpleQueryStringAnalyzer
+                     , "flags" .= simpleQueryStringFlags
+                     , "lowercase_expanded_terms" .= simpleQueryStringLowercaseExpanded
+                     , "locale" .= simpleQueryStringLocale ]
+
+
+instance ToJSON FieldOrFields where
+  toJSON (FofField fieldName) =
+    toJSON fieldName
+  toJSON (FofFields fieldNames) =
+    toJSON fieldNames
+
+instance ToJSON SimpleQueryFlag where
+  toJSON SimpleQueryAll        = "ALL"
+  toJSON SimpleQueryNone       = "NONE"
+  toJSON SimpleQueryAnd        = "AND"
+  toJSON SimpleQueryOr         = "OR"
+  toJSON SimpleQueryPrefix     = "PREFIX"
+  toJSON SimpleQueryPhrase     = "PHRASE"
+  toJSON SimpleQueryPrecedence = "PRECEDENCE"
+  toJSON SimpleQueryEscape     = "ESCAPE"
+  toJSON SimpleQueryWhitespace = "WHITESPACE"
+  toJSON SimpleQueryFuzzy      = "FUZZY"
+  toJSON SimpleQueryNear       = "NEAR"
+  toJSON SimpleQuerySlop       = "SLOP"
+
+
+instance ToJSON RegexpQuery where
+  toJSON (RegexpQuery (FieldName rqQueryField)
+          (Regexp regexpQueryQuery) rqQueryFlags
+          rqQueryBoost) =
+   object [ rqQueryField .= omitNulls base ]
+   where base = [ "value" .= regexpQueryQuery
+                , "flags" .= toJSON rqQueryFlags
+                , "boost" .= rqQueryBoost ]
+
+
+instance ToJSON QueryStringQuery where
+  toJSON (QueryStringQuery qsQueryString
+          qsDefaultField qsOperator
+          qsAnalyzer qsAllowWildcard
+          qsLowercaseExpanded  qsEnablePositionIncrements
+          qsFuzzyMaxExpansions qsFuzziness
+          qsFuzzyPrefixLength qsPhraseSlop
+          qsBoost qsAnalyzeWildcard
+          qsGeneratePhraseQueries qsMinimumShouldMatch
+          qsLenient qsLocale) =
+    omitNulls base
+    where
+      base = [ "query" .= toJSON qsQueryString
+             , "default_field" .= qsDefaultField
+             , "default_operator" .= qsOperator
+             , "analyzer" .= qsAnalyzer
+             , "allow_leading_wildcard" .= qsAllowWildcard
+             , "lowercase_expanded_terms" .= qsLowercaseExpanded
+             , "enable_position_increments" .= qsEnablePositionIncrements
+             , "fuzzy_max_expansions" .= qsFuzzyMaxExpansions
+             , "fuzziness" .= qsFuzziness
+             , "fuzzy_prefix_length" .= qsFuzzyPrefixLength
+             , "phrase_slop" .= qsPhraseSlop
+             , "boost" .= qsBoost
+             , "analyze_wildcard" .= qsAnalyzeWildcard
+             , "auto_generate_phrase_queries" .= qsGeneratePhraseQueries
+             , "minimum_should_match" .= qsMinimumShouldMatch
+             , "lenient" .= qsLenient
+             , "locale" .= qsLocale ]
+
+
+instance ToJSON RangeQuery where
+  toJSON (RangeQuery (FieldName fieldName) (Right range) boost) =
+    object [ fieldName .= conjoined ]
+    where conjoined = [ "boost" .= toJSON boost
+                      , lessKey .= lessVal
+                      , greaterKey .= greaterVal ]
+          (lessKey, lessVal, greaterKey, greaterVal) = rangeToKV range
+
+  toJSON (RangeQuery (FieldName fieldName) (Left halfRange) boost) =
+    object [ fieldName .= conjoined ]
+    where conjoined = [ "boost" .= toJSON boost
+                      , key     .= val ]
+          (key, val) = halfRangeToKV halfRange
+
+
+instance ToJSON PrefixQuery where
+  toJSON (PrefixQuery (FieldName fieldName) queryValue boost) =
+    object [ fieldName .= omitNulls base ]
+    where base = [ "value" .= toJSON queryValue
+                 , "boost" .= boost ]
+
+
+instance ToJSON NestedQuery where
+  toJSON (NestedQuery nqPath nqScoreType nqQuery) =
+    object [ "path"       .= toJSON nqPath
+           , "score_mode" .= toJSON nqScoreType
+           , "query"      .= toJSON nqQuery ]
+
+
+instance ToJSON MoreLikeThisFieldQuery where
+  toJSON (MoreLikeThisFieldQuery text (FieldName fieldName)
+          percent mtf mqt stopwords mindf maxdf
+          minwl maxwl boostTerms boost analyzer) =
+    object [ fieldName .= omitNulls base ]
+    where base = [ "like_text" .= toJSON text
+                 , "percent_terms_to_match" .= percent
+                 , "min_term_freq" .= mtf
+                 , "max_query_terms" .= mqt
+                 , "stop_words" .= stopwords
+                 , "min_doc_freq" .= mindf
+                 , "max_doc_freq" .= maxdf
+                 , "min_word_length" .= minwl
+                 , "max_word_length" .= maxwl
+                 , "boost_terms" .= boostTerms
+                 , "boost" .= boost
+                 , "analyzer" .= analyzer ]
+
+
+instance ToJSON MoreLikeThisQuery where
+  toJSON (MoreLikeThisQuery text fields percent
+          mtf mqt stopwords mindf maxdf
+          minwl maxwl boostTerms boost analyzer) =
+    omitNulls base
+    where base = [ "like_text" .= toJSON text
+                 , "fields" .= fields
+                 , "percent_terms_to_match" .= percent
+                 , "min_term_freq" .= mtf
+                 , "max_query_terms" .= mqt
+                 , "stop_words" .= stopwords
+                 , "min_doc_freq" .= mindf
+                 , "max_doc_freq" .= maxdf
+                 , "min_word_length" .= minwl
+                 , "max_word_length" .= maxwl
+                 , "boost_terms" .= boostTerms
+                 , "boost" .= boost
+                 , "analyzer" .= analyzer ]
+
+
+instance ToJSON IndicesQuery where
+  toJSON (IndicesQuery indices query noMatch) =
+    omitNulls [ "indices" .= toJSON indices
+              , "no_match_query" .= toJSON noMatch
+              , "query" .= toJSON query ]
+
+
+instance ToJSON HasParentQuery where
+  toJSON (HasParentQuery queryType query scoreType) =
+    omitNulls [ "parent_type" .= toJSON queryType
+              , "score_type" .= toJSON scoreType
+              , "query" .= toJSON query ]
+
+
+instance ToJSON HasChildQuery where
+  toJSON (HasChildQuery queryType query scoreType) =
+    omitNulls [ "query" .= toJSON query
+              , "score_type" .= toJSON scoreType
+              , "type"  .= toJSON queryType ]
+
+
+instance ToJSON FuzzyQuery where
+  toJSON (FuzzyQuery (FieldName fieldName) queryText
+          prefixLength maxEx fuzziness boost) =
+    object [ fieldName .= omitNulls base ]
+    where base = [ "value"          .= toJSON queryText
+                 , "fuzziness"      .= toJSON fuzziness
+                 , "prefix_length"  .= toJSON prefixLength
+                 , "boost" .= toJSON boost
+                 , "max_expansions" .= toJSON maxEx ]
+
+
+instance ToJSON FuzzyLikeFieldQuery where
+  toJSON (FuzzyLikeFieldQuery (FieldName fieldName)
+          fieldText maxTerms ignoreFreq fuzziness prefixLength
+          boost analyzer) =
+    object [ fieldName .=
+             omitNulls [ "like_text"       .= toJSON fieldText
+                       , "max_query_terms" .= toJSON maxTerms
+                       , "ignore_tf"       .= toJSON ignoreFreq
+                       , "fuzziness"       .= toJSON fuzziness
+                       , "prefix_length"   .= toJSON prefixLength
+                       , "analyzer" .= toJSON analyzer
+                       , "boost"           .= toJSON boost ]]
+
+
+instance ToJSON FuzzyLikeThisQuery where
+  toJSON (FuzzyLikeThisQuery fields text maxTerms
+          ignoreFreq fuzziness prefixLength boost analyzer) =
+    omitNulls base
+    where base = [ "fields"          .= toJSON fields
+                 , "like_text"       .= toJSON text
+                 , "max_query_terms" .= toJSON maxTerms
+                 , "ignore_tf"       .= toJSON ignoreFreq
+                 , "fuzziness"       .= toJSON fuzziness
+                 , "prefix_length"   .= toJSON prefixLength
+                 , "analyzer"        .= toJSON analyzer
+                 , "boost"           .= toJSON boost ]
+
+
+instance ToJSON FilteredQuery where
+  toJSON (FilteredQuery query fFilter) =
+    object [ "query"  .= toJSON query
+           , "filter" .= toJSON fFilter ]
+
+
+instance ToJSON DisMaxQuery where
+  toJSON (DisMaxQuery queries tiebreaker boost) =
+    omitNulls base
+    where base = [ "queries"     .= toJSON queries
+                 , "boost"       .= toJSON boost
+                 , "tie_breaker" .= toJSON tiebreaker ]
+
+
+instance ToJSON CommonTermsQuery where
+  toJSON (CommonTermsQuery (FieldName fieldName)
+          (QueryString query) cf lfo hfo msm
+          boost analyzer disableCoord) =
+    object [fieldName .= omitNulls base ]
+    where base = [ "query"              .= toJSON query
+                 , "cutoff_frequency"   .= toJSON cf
+                 , "low_freq_operator"  .= toJSON lfo
+                 , "minimum_should_match" .= toJSON msm
+                 , "boost" .= toJSON boost
+                 , "analyzer" .= toJSON analyzer
+                 , "disable_coord" .= toJSON disableCoord
+                 , "high_freq_operator" .= toJSON hfo ]
+
+
+instance ToJSON CommonMinimumMatch where
+  toJSON (CommonMinimumMatch mm) = toJSON mm
+  toJSON (CommonMinimumMatchHighLow (MinimumMatchHighLow lowF highF)) =
+    object [ "low_freq"  .= toJSON lowF
+           , "high_freq" .= toJSON highF ]
+
+instance ToJSON BoostingQuery where
+  toJSON (BoostingQuery bqPositiveQuery bqNegativeQuery bqNegativeBoost) =
+    object [ "positive"       .= toJSON bqPositiveQuery
+           , "negative"       .= toJSON bqNegativeQuery
+           , "negative_boost" .= toJSON bqNegativeBoost ]
+
+
+instance ToJSON BoolQuery where
+  toJSON (BoolQuery mustM notM shouldM bqMin boost disableCoord) =
+    omitNulls base
+    where base = [ "must" .= toJSON mustM
+                 , "must_not" .= toJSON notM
+                 , "should" .= toJSON shouldM
+                 , "minimum_should_match" .= toJSON bqMin
+                 , "boost" .= toJSON boost
+                 , "disable_coord" .= toJSON disableCoord ]
+
+
+instance ToJSON MatchQuery where
+  toJSON (MatchQuery (FieldName fieldName)
+          (QueryString mqQueryString) booleanOperator
+          zeroTermsQuery cutoffFrequency matchQueryType
+          analyzer maxExpansions lenient) =
+    object [ fieldName .= omitNulls base ]
+    where base = [ "query" .= mqQueryString
+                 , "operator" .= toJSON booleanOperator
+                 , "zero_terms_query" .= toJSON zeroTermsQuery
+                 , "cutoff_frequency" .= toJSON cutoffFrequency
+                 , "type" .= toJSON matchQueryType
+                 , "analyzer" .= toJSON analyzer
+                 , "max_expansions" .= toJSON maxExpansions
+                 , "lenient" .= toJSON lenient ]
+
+
+instance ToJSON MultiMatchQuery where
+  toJSON (MultiMatchQuery fields (QueryString query) boolOp
+          ztQ tb mmqt cf analyzer maxEx lenient) =
+    object ["multi_match" .= omitNulls base]
+    where base = [ "fields" .= fmap toJSON fields
+                 , "query" .= query
+                 , "operator" .= toJSON boolOp
+                 , "zero_terms_query" .= toJSON ztQ
+                 , "tiebreaker" .= toJSON tb
+                 , "type" .= toJSON mmqt
+                 , "cutoff_frequency" .= toJSON cf
+                 , "analyzer" .= toJSON analyzer
+                 , "max_expansions" .= toJSON maxEx
+                 , "lenient" .= toJSON lenient ]
+
+
+instance ToJSON MultiMatchQueryType where
+  toJSON MultiMatchBestFields = "best_fields"
+  toJSON MultiMatchMostFields = "most_fields"
+  toJSON MultiMatchCrossFields = "cross_fields"
+  toJSON MultiMatchPhrase = "phrase"
+  toJSON MultiMatchPhrasePrefix = "phrase_prefix"
+
+instance ToJSON BooleanOperator where
+  toJSON And = String "and"
+  toJSON Or = String "or"
+
+instance ToJSON ZeroTermsQuery where
+  toJSON ZeroTermsNone = String "none"
+  toJSON ZeroTermsAll  = String "all"
+
+instance ToJSON MatchQueryType where
+  toJSON MatchPhrase = "phrase"
+  toJSON MatchPhrasePrefix = "phrase_prefix"
+
+instance ToJSON FieldName where
+  toJSON (FieldName fieldName) = String fieldName
+
+instance ToJSON ReplicaCount
+instance ToJSON ShardCount
+instance ToJSON CutoffFrequency
+instance ToJSON Analyzer
+instance ToJSON MaxExpansions
+instance ToJSON Lenient
+instance ToJSON Boost
+instance ToJSON Version
+instance ToJSON Tiebreaker
+instance ToJSON MinimumMatch
+instance ToJSON DisableCoord
+instance ToJSON PrefixLength
+instance ToJSON Fuzziness
+instance ToJSON IgnoreTermFrequency
+instance ToJSON MaxQueryTerms
+instance ToJSON TypeName
+instance ToJSON IndexName
+instance ToJSON BoostTerms
+instance ToJSON MaxWordLength
+instance ToJSON MinWordLength
+instance ToJSON MaxDocFrequency
+instance ToJSON MinDocFrequency
+instance ToJSON PhraseSlop
+instance ToJSON StopWord
+instance ToJSON QueryPath
+instance ToJSON MinimumTermFrequency
+instance ToJSON PercentMatch
+instance ToJSON MappingName
+instance ToJSON DocId
+instance ToJSON QueryString
+instance ToJSON AllowLeadingWildcard
+instance ToJSON LowercaseExpanded
+instance ToJSON AnalyzeWildcard
+instance ToJSON GeneratePhraseQueries
+instance ToJSON Locale
+instance ToJSON EnablePositionIncrements
+instance FromJSON Version
+instance FromJSON IndexName
+instance FromJSON MappingName
+instance FromJSON DocId
+
+
+instance FromJSON Status where
+  parseJSON (Object v) = Status <$>
+                         v .: "ok" <*>
+                         v .: "status" <*>
+                         v .: "name" <*>
+                         v .: "version" <*>
+                         v .: "tagline"
+  parseJSON _          = empty
+
+
+instance ToJSON IndexSettings where
+  toJSON (IndexSettings s r) = object ["settings" .= object ["shards" .= s, "replicas" .= r]]
+
+
+instance (FromJSON a) => FromJSON (EsResult a) where
+  parseJSON (Object v) = EsResult <$>
+                         v .:  "_index"   <*>
+                         v .:  "_type"    <*>
+                         v .:  "_id"      <*>
+                         v .:  "_version" <*>
+                         v .:? "found"    <*>
+                         v .:  "_source"
+  parseJSON _          = empty
+
+
+instance ToJSON Search where
+  toJSON (Search query sFilter sort sTrackSortScores sFrom sSize) =
+    omitNulls [ "query" .= query
+              , "filter" .= sFilter
+              , "sort" .= sort
+              , "from" .= sFrom
+              , "size" .= sSize
+              , "track_scores" .= sTrackSortScores ]
+
+
+instance ToJSON SortSpec where
+  toJSON (DefaultSortSpec
+          (DefaultSort (FieldName dsSortFieldName) dsSortOrder dsIgnoreUnmapped
+           dsSortMode dsMissingSort dsNestedFilter)) =
+    object [dsSortFieldName .= omitNulls base] where
+      base = [ "order" .= toJSON dsSortOrder
+             , "ignore_unmapped" .= dsIgnoreUnmapped
+             , "mode" .= dsSortMode
+             , "missing" .= dsMissingSort
+             , "nested_filter" .= dsNestedFilter ]
+
+  toJSON (GeoDistanceSortSpec gdsSortOrder (GeoPoint (FieldName field) gdsLatLon) units) =
+    object [ "unit" .= toJSON units
+           , field .= toJSON gdsLatLon
+           , "order" .= toJSON gdsSortOrder ]
+
+
+instance ToJSON SortOrder where
+  toJSON Ascending  = String "asc"
+  toJSON Descending = String "desc"
+
+
+instance ToJSON SortMode where
+  toJSON SortMin = String "min"
+  toJSON SortMax = String "max"
+  toJSON SortSum = String "sum"
+  toJSON SortAvg = String "avg"
+
+
+instance ToJSON Missing where
+  toJSON LastMissing = String "_last"
+  toJSON FirstMissing = String "_first"
+  toJSON (CustomMissing txt) = String txt
+
+
+instance ToJSON ScoreType where
+  toJSON ScoreTypeMax  = "max"
+  toJSON ScoreTypeAvg  = "avg"
+  toJSON ScoreTypeSum  = "sum"
+  toJSON ScoreTypeNone = "none"
+
+
+instance ToJSON Distance where
+  toJSON (Distance dCoefficient dUnit) =
+    String boltedTogether where
+      coefText = showText dCoefficient
+      (String unitText) = toJSON dUnit
+      boltedTogether = mappend coefText unitText
+
+
+instance ToJSON DistanceUnit where
+  toJSON Miles         = String "mi"
+  toJSON Yards         = String "yd"
+  toJSON Feet          = String "ft"
+  toJSON Inches        = String "in"
+  toJSON Kilometers    = String "km"
+  toJSON Meters        = String "m"
+  toJSON Centimeters   = String "cm"
+  toJSON Millimeters   = String "mm"
+  toJSON NauticalMiles = String "nmi"
+
+
+instance ToJSON DistanceType where
+  toJSON Arc       = String "arc"
+  toJSON SloppyArc = String "sloppy_arc"
+  toJSON Plane     = String "plane"
+
+
+instance ToJSON OptimizeBbox where
+  toJSON NoOptimizeBbox = String "none"
+  toJSON (OptimizeGeoFilterType gft) = toJSON gft
+
+
+instance ToJSON GeoBoundingBoxConstraint where
+  toJSON (GeoBoundingBoxConstraint
+          (FieldName gbbcGeoBBField) gbbcConstraintBox cache type') =
+    object [gbbcGeoBBField .= toJSON gbbcConstraintBox
+           , "_cache"  .= cache
+           , "type" .= type']
+
+
+instance ToJSON GeoFilterType where
+  toJSON GeoFilterMemory  = String "memory"
+  toJSON GeoFilterIndexed = String "indexed"
+
+
+instance ToJSON GeoBoundingBox where
+  toJSON (GeoBoundingBox gbbTopLeft gbbBottomRight) =
+    object ["top_left"      .= toJSON gbbTopLeft
+           , "bottom_right" .= toJSON gbbBottomRight]
+
+
+instance ToJSON LatLon where
+  toJSON (LatLon lLat lLon) =
+    object ["lat"  .= lLat
+           , "lon" .= lLon]
+
+
+-- index for smaller ranges, fielddata for longer ranges
+instance ToJSON RangeExecution where
+  toJSON RangeExecutionIndex     = "index"
+  toJSON RangeExecutionFielddata = "fielddata"
+
+
+instance ToJSON RegexpFlags where
+  toJSON AllRegexpFlags              = String "ALL"
+  toJSON NoRegexpFlags               = String "NONE"
+  toJSON (SomeRegexpFlags (h :| fs)) = String $ T.intercalate "|" flagStrs
+    where flagStrs             = map flagStr . nub $ h:fs
+          flagStr AnyString    = "ANYSTRING"
+          flagStr Automaton    = "AUTOMATON"
+          flagStr Complement   = "COMPLEMENT"
+          flagStr Empty        = "EMPTY"
+          flagStr Intersection = "INTERSECTION"
+          flagStr Interval     = "INTERVAL"
+
+instance ToJSON Term where
+  toJSON (Term field value) = object ["term" .= object
+                                      [field .= value]]
+
+
+instance ToJSON BoolMatch where
+  toJSON (MustMatch    term  cache) = object ["must"     .= toJSON term,
+                                              "_cache" .= cache]
+  toJSON (MustNotMatch term  cache) = object ["must_not" .= toJSON term,
+                                              "_cache" .= cache]
+  toJSON (ShouldMatch  terms cache) = object ["should"   .= fmap toJSON terms,
+                                              "_cache" .= cache]
+
+
+instance (FromJSON a) => FromJSON (SearchResult a) where
+  parseJSON (Object v) = SearchResult <$>
+                         v .: "took"      <*>
+                         v .: "timed_out" <*>
+                         v .: "_shards"   <*>
+                         v .: "hits"
+  parseJSON _          = empty
+
+instance (FromJSON a) => FromJSON (SearchHits a) where
+  parseJSON (Object v) = SearchHits <$>
+                         v .: "total"     <*>
+                         v .: "max_score" <*>
+                         v .: "hits"
+  parseJSON _          = empty
+
+instance (FromJSON a) => FromJSON (Hit a) where
+  parseJSON (Object v) = Hit <$>
+                         v .: "_index" <*>
+                         v .: "_type"  <*>
+                         v .: "_id"    <*>
+                         v .: "_score" <*>
+                         v .: "_source"
+  parseJSON _          = empty
+
+instance FromJSON ShardResult where
+  parseJSON (Object v) = ShardResult <$>
+                         v .: "total"      <*>
+                         v .: "successful" <*>
+                         v .: "failed"
+  parseJSON _          = empty
diff --git a/Database/Bloodhound/Types/Instances.hs b/Database/Bloodhound/Types/Instances.hs
deleted file mode 100644
--- a/Database/Bloodhound/Types/Instances.hs
+++ /dev/null
@@ -1,795 +0,0 @@
-{-# LANGUAGE DeriveGeneric #-}
-
-module Database.Bloodhound.Types.Instances
-       ( Monoid(..)
-       , Seminearring(..)
-       , ToJSON(..)
-       ) where
-
-import Control.Applicative
-import Data.Aeson
-import Data.List (nub)
-import Data.List.NonEmpty (NonEmpty(..))
-import Data.Maybe (catMaybes)
-import Data.Monoid
-import qualified Data.Text as T
-import Database.Bloodhound.Types
-import Database.Bloodhound.Types.Class ()
-import Prelude hiding (filter)
-
-instance Monoid Filter where
-  mempty = IdentityFilter
-  mappend a b = AndFilter [a, b] defaultCache
-
-instance Seminearring Filter where
-  a <||> b = OrFilter [a, b] defaultCache
-
-instance ToJSON Filter where
-  toJSON (AndFilter filters cache) =
-    object ["and"     .= fmap toJSON filters
-           , "_cache" .= cache]
-
-  toJSON (OrFilter filters cache) =
-    object ["or"      .= fmap toJSON filters
-           , "_cache" .= cache]
-
-  toJSON (NotFilter filter cache) =
-    object ["not" .=
-            object ["filter"  .= toJSON filter
-                   , "_cache" .= cache]]
-
-  toJSON (IdentityFilter) =
-    object ["match_all" .= object []]
-
-  toJSON (TermFilter (Term termFilterField termFilterValue) cache) =
-    object ["term" .= object base]
-    where base = [termFilterField .= termFilterValue,
-                  "_cache"        .= cache]
-
-  toJSON (ExistsFilter (FieldName fieldName)) =
-    object ["exists"  .= object
-            ["field"  .= fieldName]]
-
-  toJSON (BoolFilter boolMatch) =
-    object ["bool"    .= toJSON boolMatch]
-
-  toJSON (GeoBoundingBoxFilter bbConstraint filterType) =
-    object ["geo_bounding_box" .= toJSON bbConstraint
-           , "type" .= toJSON filterType]
-
-  toJSON (GeoDistanceFilter (GeoPoint (FieldName distanceGeoField) geoDistLatLon)
-          distance distanceType optimizeBbox cache) =
-    object ["geo_distance" .=
-            object ["distance" .= toJSON distance
-                   , "distance_type" .= toJSON distanceType
-                   , "optimize_bbox" .= optimizeBbox
-                   , distanceGeoField .= toJSON geoDistLatLon
-                   , "_cache" .= cache]]
-
-  toJSON (GeoDistanceRangeFilter (GeoPoint (FieldName gddrField) drLatLon)
-          (DistanceRange geoDistRangeDistFrom drDistanceTo)) =
-    object ["geo_distance_range" .=
-            object ["from" .= toJSON geoDistRangeDistFrom
-                   , "to"  .= toJSON drDistanceTo
-                   , gddrField .= toJSON drLatLon]]
-
-  toJSON (GeoPolygonFilter (FieldName geoPolygonFilterField) latLons) =
-    object ["geo_polygon" .=
-            object [geoPolygonFilterField .=
-                    object ["points" .= fmap toJSON latLons]]]
-
-  toJSON (IdsFilter (MappingName mappingName) values) =
-    object ["ids" .=
-            object ["type" .= mappingName
-                   , "values" .= fmap (T.pack . unpackId) values]]
-
-  toJSON (LimitFilter limit) =
-    object ["limit" .= object ["value" .= limit]]
-
-  toJSON (MissingFilter (FieldName fieldName) (Existence existence) (NullValue nullValue)) =
-    object ["missing" .=
-            object ["field"       .= fieldName
-                   , "existence"  .= existence
-                   , "null_value" .= nullValue]]
-
-  toJSON (PrefixFilter (FieldName fieldName) fieldValue cache) =
-    object ["prefix" .=
-            object [fieldName .= fieldValue
-                   , "_cache" .= cache]]
-
-  toJSON (RangeFilter (FieldName fieldName) (Left halfRange) rangeExecution cache) =
-    object ["range" .=
-            object [fieldName .=
-                    object [key .= val]
-                   , "execution" .= toJSON rangeExecution
-                   , "_cache" .= cache]]
-    where
-      (key, val) = halfRangeToKV halfRange
-
-  toJSON (RangeFilter (FieldName fieldName) (Right range) rangeExecution cache) =
-    object ["range" .=
-            object [fieldName .=
-                    object [lessKey .= lessVal
-                           , greaterKey .= greaterVal]
-                   , "execution" .= toJSON rangeExecution
-                   , "_cache" .= cache]]
-    where
-      (lessKey, lessVal, greaterKey, greaterVal) = rangeToKV range
-
-  toJSON (RegexpFilter (FieldName fieldName)
-          (Regexp regexText) flags (CacheName cacheName) cache (CacheKey cacheKey)) =
-    object ["regexp" .=
-            object [fieldName .=
-                    object ["value"  .= regexText
-                           , "flags" .= toJSON flags]
-                   , "_name"      .= cacheName
-                   , "_cache"     .= cache
-                   , "_cache_key" .= cacheKey]]
-
-instance ToJSON GeoPoint where
-  toJSON (GeoPoint (FieldName geoPointField) geoPointLatLon) =
-    object [ geoPointField  .= toJSON geoPointLatLon ]
-
-
-instance ToJSON Query where
-  toJSON (TermQuery (Term termQueryField termQueryValue) boost) =
-    object [ "term" .=
-             object [termQueryField .= object merged]]
-    where
-      base = [ "value" .= termQueryValue ]
-      boosted = maybe [] (return . ("boost" .=)) boost
-      merged = mappend base boosted
-
-  toJSON (TermsQuery terms termsQueryMinimumMatch) =
-    object [ "terms" .= object conjoined ]
-    where conjoined =
-            [ "tags"                 .= fmap toJSON terms
-            , "minimum_should_match" .= toJSON termsQueryMinimumMatch ]
-
-  toJSON (IdsQuery idsQueryMappingName docIds) =
-    object [ "ids" .= object conjoined ]
-    where conjoined = [ "type"   .= toJSON idsQueryMappingName
-                      , "values" .= fmap toJSON docIds ]
-
-  toJSON (QueryQueryStringQuery qQueryStringQuery) =
-    object [ "query_string" .= toJSON qQueryStringQuery ]
-
-  toJSON (QueryMatchQuery matchQuery) =
-    object [ "match" .= toJSON matchQuery ]
-
-  toJSON (QueryMultiMatchQuery multiMatchQuery) =
-    object [ "multi_match" .= toJSON multiMatchQuery ]
-
-  toJSON (QueryBoolQuery boolQuery) =
-    object [ "bool" .= toJSON boolQuery ]
-
-  toJSON (QueryBoostingQuery boostingQuery) =
-    object [ "boosting" .= toJSON boostingQuery ]
-
-  toJSON (QueryCommonTermsQuery commonTermsQuery) =
-    object [ "common" .= toJSON commonTermsQuery ]
-
-  toJSON (ConstantScoreFilter filter boost) =
-    object [ "constant_score" .= toJSON filter
-           , "boost" .= toJSON boost]
-
-  toJSON (ConstantScoreQuery query boost) =
-    object [ "constant_score" .= toJSON query
-           , "boost"          .= toJSON boost]
-
-  toJSON (QueryDisMaxQuery disMaxQuery) =
-    object [ "dis_max" .= toJSON disMaxQuery ]
-
-  toJSON (QueryFilteredQuery qFilteredQuery) =
-    object [ "filtered" .= toJSON qFilteredQuery ]
-
-  toJSON (QueryFuzzyLikeThisQuery fuzzyQuery) =
-    object [ "fuzzy_like_this" .= toJSON fuzzyQuery ]
-
-  toJSON (QueryFuzzyLikeFieldQuery fuzzyFieldQuery) =
-    object [ "fuzzy_like_this_field" .= toJSON fuzzyFieldQuery ]
-
-  toJSON (QueryFuzzyQuery fuzzyQuery) =
-    object [ "fuzzy" .= toJSON fuzzyQuery ]
-
-  toJSON (QueryHasChildQuery childQuery) =
-    object [ "has_child" .= toJSON childQuery ]
-
-  toJSON (QueryHasParentQuery parentQuery) =
-    object [ "has_parent" .= toJSON parentQuery ]
-
-  toJSON (QueryIndicesQuery qIndicesQuery) =
-    object [ "indices" .= toJSON qIndicesQuery ]
-
-  toJSON (MatchAllQuery boost) =
-    object [ "match_all" .= object maybeAdd ]
-    where maybeAdd = catMaybes [ mField "boost" boost ]
-
-  toJSON (QueryMoreLikeThisQuery query) =
-    object [ "more_like_this" .= toJSON query ]
-
-  toJSON (QueryMoreLikeThisFieldQuery query) =
-    object [ "more_like_this_field" .= toJSON query ]
-
-  toJSON (QueryNestedQuery query) =
-    object [ "nested" .= toJSON query ]
-
-  toJSON (QueryPrefixQuery query) =
-    object [ "prefix" .= toJSON query ]
-
-  toJSON (QueryRangeQuery query) =
-    object [ "range"  .= toJSON query ]
-
-  toJSON (QueryRegexpQuery query) =
-    object [ "regexp" .= toJSON query ]
-
-  toJSON (QuerySimpleQueryStringQuery query) =
-    object [ "simple_query_string" .= toJSON query ]
-
-
-mField :: (ToJSON a, Functor f) => T.Text -> f a -> f (T.Text, Value)
-mField field = fmap ((field .=) . toJSON)
-
-instance ToJSON SimpleQueryStringQuery where
-  toJSON (SimpleQueryStringQuery sqsQueryString
-          sqsFields sqsBoolean sqsAnalyzer
-          sqsFlags  sqsLowercaseExpanded sqsLocale) =
-    object conjoined
-    where base = [ "query" .= toJSON sqsQueryString ]
-          maybeAdd =
-            catMaybes [ mField "fields" sqsFields
-                      , mField "default_operator" sqsBoolean
-                      , mField "analyzer" sqsAnalyzer
-                      , mField "flags" sqsFlags
-                      , mField "lowercase_expanded_terms" sqsLowercaseExpanded
-                      , mField "locale" sqsLocale ]
-          conjoined = base ++ maybeAdd
-
-instance ToJSON FieldOrFields where
-  toJSON (FofField fieldName) =
-    toJSON fieldName
-  toJSON (FofFields fieldNames) =
-    toJSON fieldNames
-
-instance ToJSON SimpleQueryFlag where
-  toJSON SimpleQueryAll        = "ALL"
-  toJSON SimpleQueryNone       = "NONE"
-  toJSON SimpleQueryAnd        = "AND"
-  toJSON SimpleQueryOr         = "OR"
-  toJSON SimpleQueryPrefix     = "PREFIX"
-  toJSON SimpleQueryPhrase     = "PHRASE"
-  toJSON SimpleQueryPrecedence = "PRECEDENCE"
-  toJSON SimpleQueryEscape     = "ESCAPE"
-  toJSON SimpleQueryWhitespace = "WHITESPACE"
-  toJSON SimpleQueryFuzzy      = "FUZZY"
-  toJSON SimpleQueryNear       = "NEAR"
-  toJSON SimpleQuerySlop       = "SLOP"
-
-instance ToJSON RegexpQuery where
-  toJSON (RegexpQuery (FieldName rqQueryField)
-          (Regexp regexpQueryQuery) rqQueryFlags
-          rqQueryBoost) =
-   object [ rqQueryField .= object conjoined ]
-   where base = [ "value" .= regexpQueryQuery
-                , "flags" .= toJSON rqQueryFlags ]
-         maybeAdd  = catMaybes [ mField "boost" rqQueryBoost ]
-         conjoined = base ++ maybeAdd
-
-instance ToJSON QueryStringQuery where
-  toJSON (QueryStringQuery qsQueryString
-          qsDefaultField qsOperator
-          qsAnalyzer qsAllowWildcard
-          qsLowercaseExpanded  qsEnablePositionIncrements
-          qsFuzzyMaxExpansions qsFuzziness
-          qsFuzzyPrefixLength qsPhraseSlop
-          qsBoost qsAnalyzeWildcard
-          qsGeneratePhraseQueries qsMinimumShouldMatch
-          qsLenient qsLocale) =
-    object conjoined
-    where
-      base      = [ "query" .= toJSON qsQueryString ]
-      maybeAdd  =
-        catMaybes [ mField "default_field"    qsDefaultField
-                  , mField "default_operator" qsOperator
-                  , mField "analyzer"         qsAnalyzer
-                  , mField "allow_leading_wildcard" qsAllowWildcard
-                  , mField "lowercase_expanded_terms" qsLowercaseExpanded
-                  , mField "enable_position_increments" qsEnablePositionIncrements
-                  , mField "fuzzy_max_expansions" qsFuzzyMaxExpansions
-                  , mField "fuzziness" qsFuzziness
-                  , mField "fuzzy_prefix_length" qsFuzzyPrefixLength
-                  , mField "phrase_slop" qsPhraseSlop
-                  , mField "boost" qsBoost
-                  , mField "analyze_wildcard" qsAnalyzeWildcard
-                  , mField "auto_generate_phrase_queries" qsGeneratePhraseQueries
-                  , mField "minimum_should_match" qsMinimumShouldMatch
-                  , mField "lenient" qsLenient
-                  , mField "locale" qsLocale ]
-      conjoined = base ++ maybeAdd
-
-instance ToJSON RangeQuery where
-  toJSON (RangeQuery (FieldName fieldName) (Right range) boost) =
-    object [ fieldName .= conjoined ]
-    where conjoined = [ "boost" .= toJSON boost
-                      , lessKey .= lessVal
-                      , greaterKey .= greaterVal ]
-          (lessKey, lessVal, greaterKey, greaterVal) = rangeToKV range
-
-  toJSON (RangeQuery (FieldName fieldName) (Left halfRange) boost) =
-    object [ fieldName .= conjoined ]
-    where conjoined = [ "boost" .= toJSON boost
-                      , key     .= val ]
-          (key, val) = halfRangeToKV halfRange
-
-instance ToJSON PrefixQuery where
-  toJSON (PrefixQuery (FieldName fieldName) queryValue boost) =
-    object [ fieldName .= object conjoined ]
-    where base = [ "value" .= toJSON queryValue ]
-          maybeAdd = catMaybes [ mField "boost" boost ]
-          conjoined = base ++ maybeAdd
-
-
-instance ToJSON NestedQuery where
-  toJSON (NestedQuery path scoreType query) =
-    object [ "path"       .= toJSON path
-           , "score_mode" .= toJSON scoreType
-           , "query"      .= toJSON query ]
-
-
-instance ToJSON MoreLikeThisFieldQuery where
-  toJSON (MoreLikeThisFieldQuery text (FieldName fieldName)
-          percent mtf mqt stopwords mindf maxdf
-          minwl maxwl boostTerms boost analyzer) =
-    object [ fieldName .= object conjoined ]
-    where base = [ "like_text" .= toJSON text ]
-          maybeAdd = catMaybes [ mField "percent_terms_to_match" percent
-                               , mField "min_term_freq" mtf
-                               , mField "max_query_terms" mqt
-                               , mField "stop_words" stopwords
-                               , mField "min_doc_freq" mindf
-                               , mField "max_doc_freq" maxdf
-                               , mField "min_word_length" minwl
-                               , mField "max_word_length" maxwl
-                               , mField "boost_terms" boostTerms
-                               , mField "boost" boost
-                               , mField "analyzer" analyzer ]
-          conjoined = base ++ maybeAdd
-
-
-instance ToJSON MoreLikeThisQuery where
-  toJSON (MoreLikeThisQuery text fields percent
-          mtf mqt stopwords mindf maxdf
-          minwl maxwl boostTerms boost analyzer) =
-    object conjoined
-    where base = [ "like_text" .= toJSON text ]
-          maybeAdd = catMaybes [ mField "fields" fields
-                               , mField "percent_terms_to_match" percent
-                               , mField "min_term_freq" mtf
-                               , mField "max_query_terms" mqt
-                               , mField "stop_words" stopwords
-                               , mField "min_doc_freq" mindf
-                               , mField "max_doc_freq" maxdf
-                               , mField "min_word_length" minwl
-                               , mField "max_word_length" maxwl
-                               , mField "boost_terms" boostTerms
-                               , mField "boost" boost
-                               , mField "analyzer" analyzer ]
-          conjoined = base ++ maybeAdd
-
-
-instance ToJSON IndicesQuery where
-  toJSON (IndicesQuery indices query noMatch) =
-    object $ [ "indices" .= toJSON indices
-             , "query"   .= toJSON query ] ++ maybeAdd
-    where maybeAdd = catMaybes [ mField "no_match_query" noMatch ]
-
-
-instance ToJSON HasParentQuery where
-  toJSON (HasParentQuery queryType query scoreType) =
-    object $ [ "parent_type" .= toJSON queryType
-             , "query" .= toJSON query ] ++ maybeAdd
-    where maybeAdd = catMaybes [ mField "score_type" scoreType ]
-
-
-instance ToJSON HasChildQuery where
-  toJSON (HasChildQuery queryType query scoreType) =
-    object $ [ "query" .= toJSON query
-             , "type"  .= toJSON queryType ] ++ maybeAdd
-    where maybeAdd = catMaybes [ mField "score_type" scoreType ]
-
-
-instance ToJSON FuzzyQuery where
-  toJSON (FuzzyQuery (FieldName fieldName) queryText
-          prefixLength maxEx fuzziness boost) =
-    object [ fieldName .= object conjoined ]
-    where base = [ "value"          .= toJSON queryText
-                 , "fuzziness"      .= toJSON fuzziness
-                 , "prefix_length"  .= toJSON prefixLength
-                 , "max_expansions" .= toJSON maxEx ]
-          maybeAdd = catMaybes [ mField "boost" boost ]
-          conjoined = base ++ maybeAdd
-
-
-instance ToJSON FuzzyLikeFieldQuery where
-  toJSON (FuzzyLikeFieldQuery (FieldName fieldName)
-          fieldText maxTerms ignoreFreq fuzziness prefixLength
-          boost analyzer) =
-    object $ [ fieldName .=
-               object [ "like_text"       .= toJSON fieldText
-                      , "max_query_terms" .= toJSON maxTerms
-                      , "ignore_tf"       .= toJSON ignoreFreq
-                      , "fuzziness"       .= toJSON fuzziness
-                      , "prefix_length"   .= toJSON prefixLength
-                      , "boost"           .= toJSON boost ]] ++ maybeAdd
-    where maybeAdd = catMaybes [ mField "analyzer" analyzer ]
-
-
-instance ToJSON FuzzyLikeThisQuery where
-  toJSON (FuzzyLikeThisQuery fields text maxTerms
-          ignoreFreq fuzziness prefixLength boost analyzer) =
-    object conjoined
-    where base = [ "fields"          .= toJSON fields
-                 , "like_text"       .= toJSON text
-                 , "max_query_terms" .= toJSON maxTerms
-                 , "ignore_tf"       .= toJSON ignoreFreq
-                 , "fuzziness"       .= toJSON fuzziness
-                 , "prefix_length"   .= toJSON prefixLength
-                 , "boost"           .= toJSON boost ]
-          maybeAdd = catMaybes [ mField "analyzer" analyzer ]
-          conjoined = base ++ maybeAdd
-
-
-instance ToJSON FilteredQuery where
-  toJSON (FilteredQuery query filter) =
-    object [ "query"  .= toJSON query
-           , "filter" .= toJSON filter ]
-
-
-instance ToJSON DisMaxQuery where
-  toJSON (DisMaxQuery queries tiebreaker boost) =
-    object conjoined
-    where maybeAdd = catMaybes [mField "boost" boost]
-          base = [ "queries"     .= toJSON queries
-                 , "tie_breaker" .= toJSON tiebreaker ]
-          conjoined = base ++ maybeAdd
-
-
-instance ToJSON CommonTermsQuery where
-  toJSON (CommonTermsQuery (FieldName fieldName)
-          (QueryString query) cf lfo hfo msm
-          boost analyzer disableCoord) =
-    object [fieldName .= object conjoined]
-    where base = [ "query"              .= query
-                 , "cutoff_frequency"   .= toJSON cf
-                 , "low_freq_operator"  .= toJSON lfo
-                 , "high_freq_operator" .= toJSON hfo ]
-          extension = catMaybes
-                      [ mField "minimum_should_match" msm
-                      , mField "boost" boost
-                      , mField "analyzer" analyzer
-                      , mField "disable_coord" disableCoord ]
-          conjoined = base ++ extension
-
-
-instance ToJSON CommonMinimumMatch where
-  toJSON (CommonMinimumMatch mm) = toJSON mm
-  toJSON (CommonMinimumMatchHighLow (MinimumMatchHighLow lowF highF)) =
-    object [ "low_freq"  .= toJSON lowF
-           , "high_freq" .= toJSON highF ]
-
-instance ToJSON BoostingQuery where
-  toJSON (BoostingQuery bqPositiveQuery bqNegativeQuery bqNegativeBoost) =
-    object [ "positive"       .= toJSON bqPositiveQuery
-           , "negative"       .= toJSON bqNegativeQuery
-           , "negative_boost" .= toJSON bqNegativeBoost ]
-
-
-instance ToJSON BoolQuery where
-  toJSON (BoolQuery mustM notM shouldM bqMin boost disableCoord) =
-    object filtered
-    where filtered = catMaybes
-                      [ mField "must" mustM
-                      , mField "must_not" notM
-                      , mField "should" shouldM
-                      , mField "minimum_should_match" bqMin
-                      , mField "boost" boost
-                      , mField "disable_coord" disableCoord ]
-
-
-instance ToJSON MatchQuery where
-  toJSON (MatchQuery (FieldName fieldName)
-          (QueryString queryString) booleanOperator
-          zeroTermsQuery cutoffFrequency matchQueryType
-          analyzer maxExpansions lenient) =
-    object [ fieldName .= object conjoined ]
-    where conjoined = [ "query" .= queryString
-                      , "operator" .= toJSON booleanOperator
-                      , "zero_terms_query" .= toJSON zeroTermsQuery]
-                      ++ maybeAdd
-          maybeAdd   = catMaybes [ mField "cutoff_frequency" cutoffFrequency
-                                 , mField "type" matchQueryType
-                                 , mField "analyzer" analyzer
-                                 , mField "max_expansions" maxExpansions
-                                 , mField "lenient" lenient ]
-
-
-instance ToJSON MultiMatchQuery where
-  toJSON (MultiMatchQuery fields (QueryString query) boolOp
-          ztQ tb mmqt cf analyzer maxEx lenient) =
-    object ["multi_match" .= object conjoined]
-    where baseQuery = [ "fields" .= fmap toJSON fields
-                      , "query" .= query
-                      , "operator" .= toJSON boolOp
-                      , "zero_terms_query" .= toJSON ztQ ]
-          maybeAdd = catMaybes [ mField "tiebreaker" tb
-                               , mField "type" mmqt
-                               , mField "cutoff_frequency" cf
-                               , mField "analyzer" analyzer
-                               , mField "max_expansions" maxEx
-                               , mField "lenient" lenient ]
-          conjoined = baseQuery ++ maybeAdd
-
-
-instance ToJSON MultiMatchQueryType where
-  toJSON MultiMatchBestFields = "best_fields"
-  toJSON MultiMatchMostFields = "most_fields"
-  toJSON MultiMatchCrossFields = "cross_fields"
-  toJSON MultiMatchPhrase = "phrase"
-  toJSON MultiMatchPhrasePrefix = "phrase_prefix"
-
-instance ToJSON BooleanOperator where
-  toJSON And = String "and"
-  toJSON Or = String "or"
-
-instance ToJSON ZeroTermsQuery where
-  toJSON ZeroTermsNone = String "none"
-  toJSON ZeroTermsAll  = String "all"
-
-instance ToJSON MatchQueryType where
-  toJSON MatchPhrase = "phrase"
-  toJSON MatchPhrasePrefix = "phrase_prefix"
-
-instance ToJSON FieldName where
-  toJSON (FieldName fieldName) = String fieldName
-
-instance ToJSON ReplicaCount
-instance ToJSON ShardCount
-instance ToJSON CutoffFrequency
-instance ToJSON Analyzer
-instance ToJSON MaxExpansions
-instance ToJSON Lenient
-instance ToJSON Boost
-instance ToJSON Version
-instance ToJSON Tiebreaker
-instance ToJSON MinimumMatch
-instance ToJSON DisableCoord
-instance ToJSON PrefixLength
-instance ToJSON Fuzziness
-instance ToJSON IgnoreTermFrequency
-instance ToJSON MaxQueryTerms
-instance ToJSON TypeName
-instance ToJSON IndexName
-instance ToJSON BoostTerms
-instance ToJSON MaxWordLength
-instance ToJSON MinWordLength
-instance ToJSON MaxDocFrequency
-instance ToJSON MinDocFrequency
-instance ToJSON PhraseSlop
-instance ToJSON StopWord
-instance ToJSON QueryPath
-instance ToJSON MinimumTermFrequency
-instance ToJSON PercentMatch
-instance ToJSON MappingName
-instance ToJSON DocId
-instance ToJSON QueryString
-instance ToJSON AllowLeadingWildcard
-instance ToJSON LowercaseExpanded
-instance ToJSON AnalyzeWildcard
-instance ToJSON GeneratePhraseQueries
-instance ToJSON Locale
-instance ToJSON EnablePositionIncrements
-instance FromJSON Version
-instance FromJSON IndexName
-instance FromJSON MappingName
-instance FromJSON DocId
-
-
-instance FromJSON Status where
-  parseJSON (Object v) = Status <$>
-                         v .: "ok" <*>
-                         v .: "status" <*>
-                         v .: "name" <*>
-                         v .: "version" <*>
-                         v .: "tagline"
-  parseJSON _          = empty
-
-
-instance ToJSON IndexSettings where
-  toJSON (IndexSettings s r) = object ["settings" .= object ["shards" .= s, "replicas" .= r]]
-
-
-instance (FromJSON a) => FromJSON (EsResult a) where
-  parseJSON (Object v) = EsResult <$>
-                         v .:  "_index"   <*>
-                         v .:  "_type"    <*>
-                         v .:  "_id"      <*>
-                         v .:  "_version" <*>
-                         v .:? "found"    <*>
-                         v .:  "_source"
-  parseJSON _          = empty
-
-
-instance ToJSON Search where
-  toJSON (Search query filter sort sTrackSortScores sFrom sSize) =
-    object merged where
-      lQuery  = maybeJson  "query" query
-      lFilter = maybeJson  "filter" filter
-      lSort   = maybeJsonF "sort" sort
-      merged  = mconcat [[ "from" .= sFrom
-                         , "size" .= sSize
-                         , "track_scores" .= sTrackSortScores]
-                        , lQuery
-                        , lFilter
-                        , lSort]
-
-
-instance ToJSON SortSpec where
-  toJSON (DefaultSortSpec
-          (DefaultSort (FieldName dsSortFieldName) dsSortOrder dsIgnoreUnmapped
-           dsSortMode dsMissingSort dsNestedFilter)) =
-    object [dsSortFieldName .= object merged] where
-      base = ["order" .= toJSON dsSortOrder
-             , "ignore_unmapped" .= dsIgnoreUnmapped]
-      lSortMode = maybeJson "mode" dsSortMode
-      lMissingSort = maybeJson "missing" dsMissingSort
-      lNestedFilter = maybeJson "nested_filter" dsNestedFilter
-      merged = mconcat [base, lSortMode, lMissingSort, lNestedFilter]
-
-  toJSON (GeoDistanceSortSpec gdsSortOrder (GeoPoint (FieldName field) gdsLatLon) units) =
-    object [ "unit" .= toJSON units
-           , field .= toJSON gdsLatLon
-           , "order" .= toJSON gdsSortOrder ]
-
-
-instance ToJSON SortOrder where
-  toJSON Ascending  = String "asc"
-  toJSON Descending = String "desc"
-
-
-instance ToJSON SortMode where
-  toJSON SortMin = String "min"
-  toJSON SortMax = String "max"
-  toJSON SortSum = String "sum"
-  toJSON SortAvg = String "avg"
-
-
-instance ToJSON Missing where
-  toJSON LastMissing = String "_last"
-  toJSON FirstMissing = String "_first"
-  toJSON (CustomMissing txt) = String txt
-
-
-instance ToJSON ScoreType where
-  toJSON ScoreTypeMax  = "max"
-  toJSON ScoreTypeAvg  = "avg"
-  toJSON ScoreTypeSum  = "sum"
-  toJSON ScoreTypeNone = "none"
-
-
-instance ToJSON Distance where
-  toJSON (Distance dCoefficient dUnit) =
-    String boltedTogether where
-      coefText = showText dCoefficient
-      (String unitText) = toJSON dUnit
-      boltedTogether = mappend coefText unitText
-
-
-instance ToJSON DistanceUnit where
-  toJSON Miles         = String "mi"
-  toJSON Yards         = String "yd"
-  toJSON Feet          = String "ft"
-  toJSON Inches        = String "in"
-  toJSON Kilometers    = String "km"
-  toJSON Meters        = String "m"
-  toJSON Centimeters   = String "cm"
-  toJSON Millimeters   = String "mm"
-  toJSON NauticalMiles = String "nmi"
-
-
-instance ToJSON DistanceType where
-  toJSON Arc       = String "arc"
-  toJSON SloppyArc = String "sloppy_arc"
-  toJSON Plane     = String "plane"
-
-
-instance ToJSON OptimizeBbox where
-  toJSON NoOptimizeBbox = String "none"
-  toJSON (OptimizeGeoFilterType gft) = toJSON gft
-
-
-instance ToJSON GeoBoundingBoxConstraint where
-  toJSON (GeoBoundingBoxConstraint
-          (FieldName gbbcGeoBBField) gbbcConstraintBox cache) =
-    object [gbbcGeoBBField .= toJSON gbbcConstraintBox
-           , "_cache"  .= cache]
-
-
-instance ToJSON GeoFilterType where
-  toJSON GeoFilterMemory  = String "memory"
-  toJSON GeoFilterIndexed = String "indexed"
-
-
-instance ToJSON GeoBoundingBox where
-  toJSON (GeoBoundingBox gbbTopLeft gbbBottomRight) =
-    object ["top_left"      .= toJSON gbbTopLeft
-           , "bottom_right" .= toJSON gbbBottomRight]
-
-
-instance ToJSON LatLon where
-  toJSON (LatLon lLat lLon) =
-    object ["lat"  .= lLat
-           , "lon" .= lLon]
-
-
--- index for smaller ranges, fielddata for longer ranges
-instance ToJSON RangeExecution where
-  toJSON RangeExecutionIndex     = "index"
-  toJSON RangeExecutionFielddata = "fielddata"
-
-
-instance ToJSON RegexpFlags where
-  toJSON AllRegexpFlags              = String "ALL"
-  toJSON NoRegexpFlags               = String "NONE"
-  toJSON (SomeRegexpFlags (h :| fs)) = String $ T.intercalate "|" flagStrs
-    where flagStrs             = map flagStr . nub $ h:fs
-          flagStr AnyString    = "ANYSTRING"
-          flagStr Automaton    = "AUTOMATON"
-          flagStr Complement   = "COMPLEMENT"
-          flagStr Empty        = "EMPTY"
-          flagStr Intersection = "INTERSECTION"
-          flagStr Interval     = "INTERVAL"
-
-instance ToJSON Term where
-  toJSON (Term field value) = object ["term" .= object
-                                      [field .= value]]
-
-
-instance ToJSON BoolMatch where
-  toJSON (MustMatch    term  cache) = object ["must"     .= toJSON term,
-                                              "_cache" .= cache]
-  toJSON (MustNotMatch term  cache) = object ["must_not" .= toJSON term,
-                                              "_cache" .= cache]
-  toJSON (ShouldMatch  terms cache) = object ["should"   .= fmap toJSON terms,
-                                              "_cache" .= cache]
-
-
-instance (FromJSON a) => FromJSON (SearchResult a) where
-  parseJSON (Object v) = SearchResult <$>
-                         v .: "took"      <*>
-                         v .: "timed_out" <*>
-                         v .: "_shards"   <*>
-                         v .: "hits"
-  parseJSON _          = empty
-
-instance (FromJSON a) => FromJSON (SearchHits a) where
-  parseJSON (Object v) = SearchHits <$>
-                         v .: "total"     <*>
-                         v .: "max_score" <*>
-                         v .: "hits"
-  parseJSON _          = empty
-
-instance (FromJSON a) => FromJSON (Hit a) where
-  parseJSON (Object v) = Hit <$>
-                         v .: "_index" <*>
-                         v .: "_type"  <*>
-                         v .: "_id"    <*>
-                         v .: "_score" <*>
-                         v .: "_source"
-  parseJSON _          = empty
-
-instance FromJSON ShardResult where
-  parseJSON (Object v) = ShardResult <$>
-                         v .: "total"      <*>
-                         v .: "successful" <*>
-                         v .: "failed"
-  parseJSON _          = empty
diff --git a/bloodhound.cabal b/bloodhound.cabal
--- a/bloodhound.cabal
+++ b/bloodhound.cabal
@@ -1,5 +1,5 @@
 name:                bloodhound
-version:             0.2.0.0
+version:             0.3.0.0
 synopsis:            ElasticSearch client library for Haskell
 description:         ElasticSearch made awesome for Haskell hackers
 homepage:            https://github.com/bitemyapp/bloodhound
@@ -17,13 +17,12 @@
   location: https://github.com/bitemyapp/bloodhound.git
 
 library
-  ghc-options: -Wall -fno-warn-orphans
+  ghc-options: -Wall
   default-extensions:  OverloadedStrings
   exposed-modules:     Database.Bloodhound
                        Database.Bloodhound.Client
                        Database.Bloodhound.Types
                        Database.Bloodhound.Types.Class
-                       Database.Bloodhound.Types.Instances
   build-depends:       base             >= 4.3 && <5,
                        bytestring       >= 0.10.2,
                        aeson            >= 0.7,
diff --git a/tests/tests.hs b/tests/tests.hs
--- a/tests/tests.hs
+++ b/tests/tests.hs
@@ -268,8 +268,8 @@
     it "returns document for geo boundingbox filter" $ do
       _ <- insertData
       let box = GeoBoundingBox (LatLon 40.73 (-74.1)) (LatLon 40.10 (-71.12))
-      let bbConstraint = GeoBoundingBoxConstraint (FieldName "tweet.location") box False
-      let geoFilter = GeoBoundingBoxFilter bbConstraint GeoFilterMemory
+      let bbConstraint = GeoBoundingBoxConstraint (FieldName "tweet.location") box False GeoFilterMemory
+      let geoFilter = GeoBoundingBoxFilter bbConstraint
       let search = mkSearch Nothing (Just geoFilter)
       myTweet <- searchTweet search
       myTweet `shouldBe` Right exampleTweet
@@ -277,8 +277,8 @@
     it "doesn't return document for nonsensical boundingbox filter" $ do
       _ <- insertData
       let box          = GeoBoundingBox (LatLon 0.73 (-4.1)) (LatLon 0.10 (-1.12))
-      let bbConstraint = GeoBoundingBoxConstraint (FieldName "tweet.location") box False
-      let geoFilter    = GeoBoundingBoxFilter bbConstraint GeoFilterMemory
+      let bbConstraint = GeoBoundingBoxConstraint (FieldName "tweet.location") box False GeoFilterMemory
+      let geoFilter    = GeoBoundingBoxFilter bbConstraint
       let search       = mkSearch Nothing (Just geoFilter)
       searchExpectNoResults search
 
@@ -361,6 +361,8 @@
                    (CacheName "test") False (CacheKey "key")
       let search = mkSearch Nothing (Just filter)
       searchExpectNoResults search
+
+
   describe "ToJSON RegexpFlags" $ do
     it "generates the correct JSON for AllRegexpFlags" $
       toJSON AllRegexpFlags `shouldBe` String "ALL"