diff --git a/Data/Aeson/TH/Smart.hs b/Data/Aeson/TH/Smart.hs
--- a/Data/Aeson/TH/Smart.hs
+++ b/Data/Aeson/TH/Smart.hs
@@ -432,8 +432,7 @@
 
 noMatch :: Name -> MatchQ
 noMatch tName = do
-  other <- newName "other"
-  flip (match (varP other)) []
+  flip (match wildP) []
     (normalB $ [| fail $ printf "No constructors for type %s were present." |]
       `appE` (sigE (litE $ stringL $ nameBase tName) (conT ''String)))
 
diff --git a/Database/Cypher.hs b/Database/Cypher.hs
--- a/Database/Cypher.hs
+++ b/Database/Cypher.hs
@@ -44,6 +44,7 @@
 import qualified Data.HashMap.Strict as H
 import Data.Text.Lazy.Builder
 import Data.Aeson.Encode
+import Data.List (elemIndices)
 
 -- | Information about your neo4j configuration needed to make requests over the REST api.
 data DBInfo = DBInfo {
@@ -104,7 +105,8 @@
 	parseJSON _ = mempty
 
 instance ToJSON (Entity a) where
-	toJSON = toJSON . entity_id
+	toJSON a = toJSON (read x :: Int) where
+		(_, _:x) = splitAt (last (elemIndices '/' (entity_id a))) (entity_id a)
 
 $(deriveJSON (drop 3) ''CypherResult)
 $(deriveJSON (drop 4) ''CypherRequest)
diff --git a/cypher.cabal b/cypher.cabal
--- a/cypher.cabal
+++ b/cypher.cabal
@@ -7,7 +7,7 @@
 -- The package version. See the Haskell package versioning policy
 -- (http://www.haskell.org/haskellwiki/Package_versioning_policy) for
 -- standards guiding when and how versions should be incremented.
-Version:             0.6
+Version:             0.7
 
 -- A short (one-line) description of the package.
 Synopsis:            Haskell bindings for the neo4j "cypher" query language